vxe-pc-ui 3.15.22 → 3.15.24

package/es/date-panel/src/date-panel.js

@@ -37,6 +37,7 @@ export default {
             type: [String, Number, Date],
             default: () => getConfig().datePanel.endDate
         },
+        defaultMode: String,
         defaultDate: [String, Number, Date],
         defaultTime: [String, Number, Date],
         minDate: [String, Number, Date],
@@ -48,6 +49,7 @@ export default {
         labelFormat: String,
         valueFormat: String,
         timeFormat: String,
+        valueSort: Boolean,
         festivalMethod: {
             type: Function,
             default: () => getConfig().datePanel.festivalMethod
@@ -171,12 +173,14 @@ export default {
         computeDateValue() {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
-            const { value: modelValue } = props;
+            const { value: modelValue, defaultMode } = props;
             const isDatePanelType = $xeDatePanel.computeIsDatePanelType;
             const dateValueFormat = $xeDatePanel.computeDateValueFormat;
             let val = null;
             if (modelValue && isDatePanelType) {
-                const date = $xeDatePanel.parseDate(modelValue, dateValueFormat);
+                const vals = XEUtils.isString(modelValue) ? modelValue.split(',') : modelValue;
+                const currVal = defaultMode === 'last' ? XEUtils.last(vals) : XEUtils.first(vals);
+                const date = $xeDatePanel.parseDate(currVal, dateValueFormat);
                 if (XEUtils.isValidDate(date)) {
                     val = date;
                 }
@@ -634,10 +638,10 @@ export default {
             const props = $xeDatePanel;
             const { type, multiple } = props;
             if (type === 'time') {
-                return toStringTimeDate(value);
+                return toStringTimeDate(XEUtils.isArray(value) ? value : XEUtils.last(value));
             }
             if (XEUtils.isArray(value)) {
-                return XEUtils.toStringDate(value[0], format);
+                return XEUtils.toStringDate(XEUtils.last(value), format);
             }
             if (XEUtils.isString(value)) {
                 return XEUtils.toStringDate(multiple ? XEUtils.last(value.split(',')) : value, format);
@@ -708,7 +712,7 @@ export default {
                 $xeDatePanel.handleChange('', { type: 'check' });
             }
         },
-        handleChange(value, evnt) {
+        handleChange(value, evnt, params) {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
             const reactData = $xeDatePanel.reactData;
@@ -720,20 +724,20 @@ export default {
                 const timeNum = dateVal ? dateVal.getTime() : null;
                 $xeDatePanel.emitModel(timeNum);
                 if (modelValue !== timeNum) {
-                    $xeDatePanel.dispatchEvent('change', { value: timeNum }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value: timeNum, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
             else if (hasDateValueType(valueFormat)) {
                 const dateVal = parseDateValue(value, type, { valueFormat: dateValueFormat });
                 $xeDatePanel.emitModel(dateVal);
                 if (modelValue && dateVal ? XEUtils.toStringDate(modelValue).getTime() !== dateVal.getTime() : modelValue !== dateVal) {
-                    $xeDatePanel.dispatchEvent('change', { value: dateVal }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value: dateVal, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
             else {
                 $xeDatePanel.emitModel(value);
                 if (XEUtils.toValueString(modelValue) !== value) {
-                    $xeDatePanel.dispatchEvent('change', { value }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
         },
@@ -807,7 +811,7 @@ export default {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
             const reactData = $xeDatePanel.reactData;
-            const { value: modelValue, multiple } = props;
+            const { value: modelValue, multiple, valueSort } = props;
             const { datetimePanelValue } = reactData;
             const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
             const dateValueFormat = $xeDatePanel.computeDateValueFormat;
@@ -831,7 +835,7 @@ export default {
                 if (isDateTimeType) {
                     // 如果是datetime特殊类型
                     const dateListValue = isReload ? [] : [...$xeDatePanel.computeDateListValue];
-                    const datetimeRest = [];
+                    let datetimeRest = [];
                     const eqIndex = XEUtils.findIndexOf(dateListValue, val => XEUtils.isDateSame(date, val, 'yyyyMMdd'));
                     if (eqIndex === -1) {
                         if (overCount) {
@@ -853,27 +857,37 @@ export default {
                             datetimeRest.push(item);
                         }
                     });
-                    $xeDatePanel.handleChange(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' });
+                    // 排序
+                    if (valueSort) {
+                        datetimeRest = datetimeRest.sort((a, b) => a.getTime() - b.getTime());
+                    }
+                    $xeDatePanel.handleChange(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' }, { currValue: inpVal });
                 }
                 else {
                     const dateMultipleValue = isReload ? [] : $xeDatePanel.computeDateMultipleValue;
+                    let dateRest = [];
                     // 如果是日期类型
                     if (dateMultipleValue.some(val => XEUtils.isEqual(val, inpVal))) {
-                        $xeDatePanel.handleChange(dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal)).join(','), { type: 'update' });
+                        dateRest = dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal));
                     }
                     else {
                         if (overCount) {
                             // 如果超出最大多选数量
                             return;
                         }
-                        $xeDatePanel.handleChange(dateMultipleValue.concat([inpVal]).join(','), { type: 'update' });
+                        dateRest = dateMultipleValue.concat([inpVal]);
+                    }
+                    // 排序
+                    if (valueSort) {
+                        dateRest = dateRest.sort();
                     }
+                    $xeDatePanel.handleChange(dateRest.join(','), { type: 'update' }, { currValue: inpVal });
                 }
             }
             else {
                 // 如果为单选
                 if (!XEUtils.isEqual(modelValue, inpVal)) {
-                    $xeDatePanel.handleChange(inpVal, { type: 'update' });
+                    $xeDatePanel.handleChange(inpVal, { type: 'update' }, { currValue: inpVal });
                 }
             }
         },
@@ -1318,6 +1332,12 @@ export default {
             const reactData = $xeDatePanel.reactData;
             return reactData.inputValue;
         },
+        getViewType() {
+            const $xeDatePanel = this;
+            const reactData = $xeDatePanel.reactData;
+            const { datePanelType } = reactData;
+            return datePanelType;
+        },
         setPanelDate(date) {
             const $xeDatePanel = this;
             if (date) {

package/es/date-panel/src/util.js

@@ -74,11 +74,11 @@ export function getDateQuarter(date) {
     }
     return 4;
 }
-export const parseDateValue = (val, type, options) => {
+export function parseDateValue(val, type, options) {
     const { valueFormat } = options;
     if (val) {
         if (type === 'time') {
-            return toStringTimeDate(val);
+            return toStringTimeDate(XEUtils.isArray(val) ? val : XEUtils.last(val));
         }
         if (XEUtils.isNumber(val) || /^[0-9]{10,15}$/.test(`${val}`)) {
             return new Date(Number(val));
@@ -86,10 +86,13 @@ export const parseDateValue = (val, type, options) => {
         if (XEUtils.isString(val)) {
             return XEUtils.toStringDate(XEUtils.last(val.split(',')), valueFormat);
         }
+        if (XEUtils.isArray(val)) {
+            return XEUtils.toStringDate(XEUtils.last(val), valueFormat);
+        }
         return XEUtils.toStringDate(val, valueFormat);
     }
     return null;
-};
+}
 export function parseDateString(val, type, options) {
     const dValue = parseDateValue(val, type, options);
     return dValue ? XEUtils.toDateString(dValue, options.valueFormat) : '';
@@ -256,3 +259,27 @@ export function checkDateInputFormat(numStr, formatKey) {
     }
     return numVal;
 }
+export const getPrevMonth = (date) => {
+    const currtYear = date.getFullYear();
+    const currMonth = date.getMonth();
+    if (currMonth) {
+        date.setMonth(currMonth - 1);
+    }
+    else {
+        date.setFullYear(currtYear - 1);
+        date.setMonth(11);
+    }
+    return date;
+};
+export const getNextMonth = (date) => {
+    const currtYear = date.getFullYear();
+    const currMonth = date.getMonth();
+    if (currMonth < 11) {
+        date.setMonth(currMonth + 1);
+    }
+    else {
+        date.setFullYear(currtYear + 1);
+        date.setMonth(0);
+    }
+    return date;
+};

package/es/date-picker/src/date-picker.js

@@ -48,7 +48,7 @@ export default {
         event: 'modelValue'
     },
     props: {
-        value: [String, Number, Date],
+        value: [String, Number, Date, Array],
         immediate: {
             type: Boolean,
             default: true