vxe-pc-ui 3.15.22 → 3.15.23

package/lib/index.umd.js

@@ -13226,7 +13226,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.15.22");
+var uiVersion = "ui v".concat("3.15.23");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13244,7 +13244,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.15.22";
+var ui_version = "3.15.23";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -38353,8 +38353,9 @@ var date_range_picker_createComponentLog = createComponentLog('date-range-picker
       var $xeDateRangePicker = this;
       var props = $xeDateRangePicker;
       var modelValue = props.value,
-        valueType = props.valueType;
-      var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
+        valueType = props.valueType,
+        valueFormat = props.valueFormat;
+      var isArr = valueFormat === 'date' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
       if (valueType) {
         switch (valueType) {
           case 'array':
@@ -38366,7 +38367,7 @@ var date_range_picker_createComponentLog = createComponentLog('date-range-picker
         }
       }
       if (sValue || eValue) {
-        var rest = [sValue || '', eValue || ''];
+        var rest = [sValue || null, eValue || null];
         if (isArr) {
           return rest;
         }
@@ -38470,19 +38471,49 @@ var date_range_picker_createComponentLog = createComponentLog('date-range-picker
       var reactData = $xeDateRangePicker.reactData;
       var $xeForm = $xeDateRangePicker.$xeForm;
       var formItemInfo = $xeDateRangePicker.formItemInfo;
-      var modelValue = props.value;
-      reactData.startValue = sValue;
-      reactData.endValue = eValue;
-      var value = $xeDateRangePicker.getRangeValue(sValue, eValue);
-      var isFinish = sValue && eValue || !sValue && !eValue;
-      $xeDateRangePicker.emitModel(value);
-      $xeDateRangePicker.$emit('update:startValue', sValue || '');
-      $xeDateRangePicker.$emit('update:endValue', eValue || '');
+      var type = props.type,
+        modelValue = props.value,
+        valueFormat = props.valueFormat;
+      var dateValueFormat = $xeDateRangePicker.computeDateValueFormat;
+      var startRest = sValue;
+      var endRest = eValue;
+      if (hasTimestampValueType(valueFormat)) {
+        if (startRest) {
+          var dateVal = parseDateValue(startRest, type, {
+            valueFormat: dateValueFormat
+          });
+          startRest = dateVal ? dateVal.getTime() : null;
+        }
+        if (endRest) {
+          var _dateVal = parseDateValue(endRest, type, {
+            valueFormat: dateValueFormat
+          });
+          endRest = _dateVal ? _dateVal.getTime() : null;
+        }
+      } else if (hasDateValueType(valueFormat)) {
+        if (startRest) {
+          startRest = parseDateValue(startRest, type, {
+            valueFormat: dateValueFormat
+          });
+        }
+        if (endRest) {
+          endRest = parseDateValue(endRest, type, {
+            valueFormat: dateValueFormat
+          });
+        }
+      }
+      reactData.startValue = startRest;
+      reactData.endValue = endRest;
+      var value = $xeDateRangePicker.getRangeValue(startRest, endRest);
+      var isFinish = startRest && endRest || !startRest && !endRest;
+      $xeDateRangePicker.$emit('update:modelValue', value);
+      $xeDateRangePicker.$emit('update:startValue', startRest || '');
+      $xeDateRangePicker.$emit('update:endValue', endRest || '');
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(modelValue) !== value) {
         $xeDateRangePicker.dispatchEvent('change', {
           value: value,
-          startValue: sValue,
-          endValue: eValue,
+          startValue: startRest,
+          endValue: endRest,
           isFinish: isFinish
         }, evnt);
         // 自动更新校验状态