vxe-pc-ui 3.18.16 → 3.18.18

package/lib/index.umd.js

@@ -13288,7 +13288,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.18.16");
+var uiVersion = "ui v".concat("3.18.18");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13308,7 +13308,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.18.16";
+var ui_version = "3.18.18";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -19053,18 +19053,8 @@ var calendar_menus = VxeUI.menus,
     },
     labelFormat: String,
     valueFormat: String,
-    festivalMethod: {
-      type: Function,
-      default: function _default() {
-        return calendar_getConfig().calendar.festivalMethod;
-      }
-    },
-    disabledMethod: {
-      type: Function,
-      default: function _default() {
-        return calendar_getConfig().calendar.disabledMethod;
-      }
-    },
+    festivalMethod: Function,
+    disabledMethod: Function,
     cellStyle: [Object, Function],
     menuConfig: Object,
     // week
@@ -19090,10 +19080,15 @@ var calendar_menus = VxeUI.menus,
       monthSize: 20,
       quarterSize: 8
     };
+    var defaultFuncProps = {
+      festivalMethod: calendar_getConfig().calendar.festivalMethod,
+      disabledMethod: calendar_getConfig().calendar.disabledMethod
+    };
     return {
       xID: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId(),
       reactData: reactData,
-      internalData: internalData
+      internalData: internalData,
+      defaultFuncProps: defaultFuncProps
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -19733,9 +19728,10 @@ var calendar_menus = VxeUI.menus,
       var $xeCalendar = this;
       var props = $xeCalendar;
       var reactData = $xeCalendar.reactData;
-      var disabledMethod = props.disabledMethod;
+      var defaultFuncProps = $xeCalendar.defaultFuncProps;
+      var disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
       var datePanelType = reactData.datePanelType;
-      return disabledMethod && disabledMethod({
+      return disbMethod && disbMethod({
         type: datePanelType,
         viewType: datePanelType,
         date: item.date,
@@ -19989,10 +19985,11 @@ var calendar_menus = VxeUI.menus,
       var $xeCalendar = this;
       var props = $xeCalendar;
       var reactData = $xeCalendar.reactData;
-      var festivalMethod = props.festivalMethod;
-      if (festivalMethod) {
+      var defaultFuncProps = $xeCalendar.defaultFuncProps;
+      var flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
+      if (flMethod) {
         var datePanelType = reactData.datePanelType;
-        var festivalRest = festivalMethod({
+        var festivalRest = flMethod({
           type: datePanelType,
           viewType: datePanelType,
           date: item.date,
@@ -24311,18 +24308,8 @@ var input_createComponentLog = createComponentLog('input'),
       type: Boolean,
       default: true
     },
-    festivalMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().input.festivalMethod;
-      }
-    },
-    disabledMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().input.disabledMethod;
-      }
-    },
+    festivalMethod: Function,
+    disabledMethod: Function,
     // week
     selectDay: {
       type: [String, Number],
@@ -24394,10 +24381,15 @@ var input_createComponentLog = createComponentLog('input'),
       hpTimeout: undefined,
       dnTimeout: undefined
     };
+    var defaultFuncProps = {
+      festivalMethod: getConfig().input.festivalMethod,
+      disabledMethod: getConfig().input.disabledMethod
+    };
     return {
       xID: xID,
       reactData: reactData,
-      internalData: internalData
+      internalData: internalData,
+      defaultFuncProps: defaultFuncProps
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -25871,7 +25863,8 @@ var input_createComponentLog = createComponentLog('input'),
       var $xeInput = this;
       var props = $xeInput;
       var reactData = $xeInput.reactData;
-      var disabledMethod = props.disabledMethod;
+      var defaultFuncProps = $xeInput.defaultFuncProps;
+      var disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
       var datePanelType = reactData.datePanelType;
       var dateStartTime = $xeInput.computeDateStartTime;
       var dateEndTime = $xeInput.computeDateEndTime;
@@ -25882,8 +25875,8 @@ var input_createComponentLog = createComponentLog('input'),
       if (dateEndTime && dateEndTime.getTime() < date.getTime()) {
         return true;
       }
-      if (disabledMethod) {
-        return disabledMethod({
+      if (disbMethod) {
+        return disbMethod({
           type: datePanelType,
           viewType: datePanelType,
           date: date,
@@ -26473,10 +26466,11 @@ var input_createComponentLog = createComponentLog('input'),
       var $xeInput = this;
       var props = $xeInput;
       var reactData = $xeInput.reactData;
-      var festivalMethod = props.festivalMethod;
-      if (festivalMethod) {
+      var defaultFuncProps = $xeInput.defaultFuncProps;
+      var flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
+      if (flMethod) {
         var datePanelType = reactData.datePanelType;
-        var festivalRest = festivalMethod({
+        var festivalRest = flMethod({
           type: datePanelType,
           viewType: datePanelType,
           date: item.date,
@@ -35437,18 +35431,8 @@ var date_panel_createComponentLog = createComponentLog('date-panel'),
     valueFormat: String,
     timeFormat: String,
     valueSort: Boolean,
-    festivalMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().datePanel.festivalMethod;
-      }
-    },
-    disabledMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().datePanel.disabledMethod;
-      }
-    },
+    festivalMethod: Function,
+    disabledMethod: Function,
     timeConfig: Object,
     // week
     selectDay: {
@@ -35479,10 +35463,15 @@ var date_panel_createComponentLog = createComponentLog('date-panel'),
       quarterSize: 4,
       hpTimeout: undefined
     };
+    var defaultFuncProps = {
+      festivalMethod: getConfig().datePanel.festivalMethod,
+      disabledMethod: getConfig().datePanel.disabledMethod
+    };
     return {
       xID: xID,
       reactData: reactData,
-      internalData: internalData
+      internalData: internalData,
+      defaultFuncProps: defaultFuncProps
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -36529,11 +36518,12 @@ var date_panel_createComponentLog = createComponentLog('date-panel'),
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var reactData = $xeDatePanel.reactData;
-      var disabledMethod = props.disabledMethod;
+      var defaultFuncProps = $xeDatePanel.defaultFuncProps;
+      var disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
       var datePanelType = reactData.datePanelType;
       var date = item.date;
-      if (disabledMethod) {
-        return disabledMethod({
+      if (disbMethod) {
+        return disbMethod({
           type: datePanelType,
           viewType: datePanelType,
           date: date,
@@ -36865,11 +36855,12 @@ var date_panel_createComponentLog = createComponentLog('date-panel'),
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var reactData = $xeDatePanel.reactData;
-      var festivalMethod = props.festivalMethod;
+      var defaultFuncProps = $xeDatePanel.defaultFuncProps;
+      var flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
       var labelVNs = [];
-      if (festivalMethod) {
+      if (flMethod) {
         var datePanelType = reactData.datePanelType;
-        var festivalRest = festivalMethod({
+        var festivalRest = flMethod({
           type: datePanelType,
           viewType: datePanelType,
           date: item.date,
@@ -36906,6 +36897,10 @@ var date_panel_createComponentLog = createComponentLog('date-panel'),
             class: 'vxe-date-panel--festival--label'
           }, festivalLabels[0].substring(0, 3))]));
         }
+      } else {
+        labelVNs.push(h('div', {
+          class: 'vxe-date-panel--label'
+        }, "".concat(label)));
       }
       return labelVNs;
     },
@@ -37663,28 +37658,13 @@ function date_picker_createInternalData() {
     labelFormat: String,
     valueFormat: String,
     timeFormat: String,
-    parseInputMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().datePicker.parseInputMethod;
-      }
-    },
+    parseInputMethod: Function,
     editable: {
       type: Boolean,
       default: true
     },
-    festivalMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().datePicker.festivalMethod;
-      }
-    },
-    disabledMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().datePicker.disabledMethod;
-      }
-    },
+    festivalMethod: Function,
+    disabledMethod: Function,
     // week
     selectDay: {
       type: [String, Number],
@@ -37762,9 +37742,15 @@ function date_picker_createInternalData() {
   data: function data() {
     var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     var reactData = date_picker_createReactData();
+    var defaultFuncProps = {
+      parseInputMethod: getConfig().datePicker.parseInputMethod,
+      festivalMethod: getConfig().datePicker.festivalMethod,
+      disabledMethod: getConfig().datePicker.disabledMethod
+    };
     return _objectSpread2(_objectSpread2({}, {}), {}, {
       xID: xID,
-      reactData: reactData
+      reactData: reactData,
+      defaultFuncProps: defaultFuncProps
     });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -38252,16 +38238,17 @@ function date_picker_createInternalData() {
       var props = $xeDatePicker;
       var reactData = $xeDatePicker.reactData;
       var internalData = $xeDatePicker.internalData;
+      var defaultFuncProps = $xeDatePicker.defaultFuncProps;
       var type = props.type,
         editable = props.editable,
         multiple = props.multiple,
-        maskedConfig = props.maskedConfig,
-        parseInputMethod = props.parseInputMethod;
+        maskedConfig = props.maskedConfig;
       var inputLabel = internalData.inputLabel;
       var dateLabelFormat = $xeDatePicker.computeDateLabelFormat;
       var maskedOpts = $xeDatePicker.computeMaskedOpts;
       var dateStartDate = $xeDatePicker.computeDateStartDate;
       var dateEndDate = $xeDatePicker.computeDateEndDate;
+      var parseInpMethod = props.parseInputMethod || defaultFuncProps.parseInputMethod;
       if (!inpVal) {
         $xeDatePicker.handleChange('', {
           type: 'check'
@@ -38290,8 +38277,8 @@ function date_picker_createInternalData() {
         }
       }
       var inpDateVal;
-      if (parseInputMethod) {
-        inpDateVal = parseInputMethod({
+      if (parseInpMethod) {
+        inpDateVal = parseInpMethod({
           $datePicker: $xeDatePicker,
           type: type,
           inputValue: inpVal,
@@ -39144,6 +39131,7 @@ function date_picker_createInternalData() {
       var props = $xeDatePicker;
       var slots = $xeDatePicker.$scopedSlots;
       var reactData = $xeDatePicker.reactData;
+      var defaultFuncProps = $xeDatePicker.defaultFuncProps;
       var popupOpts = $xeDatePicker.computePopupOpts;
       if (popupOpts.enabled === false) {
         return renderEmptyElement($xeDatePicker);
@@ -39221,8 +39209,8 @@ function date_picker_createInternalData() {
           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
         },
         on: {
@@ -39592,18 +39580,8 @@ function date_range_picker_createInternalData() {
       type: Boolean,
       default: true
     },
-    festivalMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().dateRangePicker.festivalMethod;
-      }
-    },
-    disabledMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().dateRangePicker.disabledMethod;
-      }
-    },
+    festivalMethod: Function,
+    disabledMethod: Function,
     separator: {
       type: [String, Number],
       default: function _default() {
@@ -39681,9 +39659,14 @@ function date_range_picker_createInternalData() {
   data: function data() {
     var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     var reactData = date_range_picker_createReactData();
+    var defaultFuncProps = {
+      festivalMethod: getConfig().dateRangePicker.festivalMethod,
+      disabledMethod: getConfig().dateRangePicker.disabledMethod
+    };
     return _objectSpread2(_objectSpread2({}, {}), {}, {
       xID: xID,
-      reactData: reactData
+      reactData: reactData,
+      defaultFuncProps: defaultFuncProps
     });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -40879,6 +40862,7 @@ function date_range_picker_createInternalData() {
       var props = $xeDateRangePicker;
       var slots = $xeDateRangePicker.$scopedSlots;
       var reactData = $xeDateRangePicker.reactData;
+      var defaultFuncProps = $xeDateRangePicker.defaultFuncProps;
       var popupOpts = $xeDateRangePicker.computePopupOpts;
       if (popupOpts.enabled === false) {
         return renderEmptyElement($xeDateRangePicker);
@@ -40971,8 +40955,8 @@ function date_range_picker_createInternalData() {
           defaultDate: sdDate,
           defaultTime: sdTime,
           timeConfig: timeOpts,
-          festivalMethod: props.festivalMethod,
-          disabledMethod: props.disabledMethod,
+          festivalMethod: props.festivalMethod || defaultFuncProps.festivalMethod,
+          disabledMethod: props.disabledMethod || defaultFuncProps.disabledMethod,
           cellClassName: $xeDateRangePicker.panelCellClassName,
           selectDay: props.selectDay
         },
@@ -41001,8 +40985,8 @@ function date_range_picker_createInternalData() {
           defaultDate: edDate,
           defaultTime: edTime,
           timeConfig: timeOpts,
-          festivalMethod: props.festivalMethod,
-          disabledMethod: props.disabledMethod,
+          festivalMethod: props.festivalMethod || defaultFuncProps.festivalMethod,
+          disabledMethod: props.disabledMethod || defaultFuncProps.disabledMethod,
           cellClassName: $xeDateRangePicker.panelCellClassName,
           selectDay: props.selectDay
         },
@@ -41562,12 +41546,7 @@ var Loading = VxeLoading;
         return getConfig().drawer.size || getConfig().size;
       }
     },
-    beforeHideMethod: {
-      type: Function,
-      default: function _default() {
-        return getConfig().drawer.beforeHideMethod;
-      }
-    },
+    beforeHideMethod: Function,
     slots: Object
   },
   inject: {
@@ -41599,9 +41578,13 @@ var Loading = VxeLoading;
       drawerZIndex: 0,
       resizeFlag: 1
     };
+    var defaultFuncProps = {
+      beforeHideMethod: getConfig().drawer.beforeHideMethod
+    };
     return {
       xID: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId(),
       reactData: reactData,
+      defaultFuncProps: defaultFuncProps,
       reFlag: 0
     };
   },
@@ -41725,13 +41708,14 @@ var Loading = VxeLoading;
       var $xeDrawer = this;
       var props = $xeDrawer;
       var reactData = $xeDrawer.reactData;
-      var beforeHideMethod = props.beforeHideMethod;
+      var defaultFuncProps = $xeDrawer.defaultFuncProps;
       var visible = reactData.visible;
+      var beHideMethod = props.beforeHideMethod || defaultFuncProps.beforeHideMethod;
       var params = {
         type: type
       };
       if (visible) {
-        Promise.resolve(beforeHideMethod ? beforeHideMethod(params) : null).then(function (rest) {
+        Promise.resolve(beHideMethod ? beHideMethod(params) : null).then(function (rest) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(rest)) {
             var el = $xeDrawer.$refs.refElem;
             if (el) {