vxe-pc-ui 3.15.1 → 3.15.2

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

@@ -19,6 +19,18 @@ export function handleValueFormat(type, valueFormat) {
     }
     return 'yyyy-MM-dd';
 }
+export function handleInputFormat(type, inputFormat) {
+    if (inputFormat) {
+        return inputFormat;
+    }
+    if (type === 'time') {
+        return 'HH:mm:ss';
+    }
+    if (type === 'datetime') {
+        return 'yyyy-MM-dd HH:mm:ss';
+    }
+    return 'yyyy-MM-dd';
+}
 export function toStringTimeDate(str) {
     const rest = new Date(2e3, 0, 1);
     if (str) {

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

@@ -4,7 +4,7 @@ import { getConfig, getIcon, getI18n, commands, createEvent, globalEvents, GLOBA
 import { getFuncText, getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
 import { updatePanelPlacement, getEventTargetNode } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
-import { parseDateObj, parseDateValue, getDateByCode, handleValueFormat, hasDateValueType, hasTimestampValueType } from '../../date-panel/src/util';
+import { parseDateObj, parseDateValue, getDateByCode, handleValueFormat, handleInputFormat, hasDateValueType, hasTimestampValueType } from '../../date-panel/src/util';
 import { errLog } from '../../ui/src/log';
 import VxeDatePanelComponent from '../../date-panel/src/date-panel';
 import VxeButtonComponent from '../../button/src/button';
@@ -78,6 +78,7 @@ export default {
         labelFormat: String,
         valueFormat: String,
         timeFormat: String,
+        inputFormat: String,
         editable: {
             type: Boolean,
             default: true
@@ -107,6 +108,7 @@ export default {
             type: Boolean,
             default: () => getConfig().datePicker.autoClose
         },
+        controlConfig: Object,
         prefixIcon: String,
         suffixIcon: String,
         placement: String,
@@ -158,7 +160,8 @@ export default {
             inputLabel: ''
         };
         const internalData = {
-            hpTimeout: undefined
+            // hpTimeout: undefined,
+            parseInputKayMaps: {}
         };
         return {
             xID,
@@ -298,6 +301,12 @@ export default {
             const { type, valueFormat } = props;
             return handleValueFormat(type, valueFormat);
         },
+        computeDateInputFormat() {
+            const $xeDatePicker = this;
+            const props = $xeDatePicker;
+            const { type, inputFormat } = props;
+            return handleInputFormat(type, inputFormat);
+        },
         computeFirstDayOfWeek() {
             const $xeDatePicker = this;
             const props = $xeDatePicker;
@@ -322,6 +331,11 @@ export default {
                 });
                 return dateObj.label;
             }).join(', ');
+        },
+        computeControlOpts() {
+            const $xeDatePicker = this;
+            const props = $xeDatePicker;
+            return Object.assign({}, getConfig().datePicker.controlConfig, props.controlConfig);
         } }),
     methods: {
         //
@@ -430,6 +444,9 @@ export default {
             if (!trigger || trigger === 'default') {
                 $xeDatePicker.datePickerOpenEvent(evnt);
             }
+            else if (trigger === 'icon') {
+                $xeDatePicker.hidePanel();
+            }
             $xeDatePicker.triggerEvent(evnt);
         },
         clickPrefixEvent(evnt) {
@@ -471,6 +488,35 @@ export default {
                 $xeDatePicker.dispatchEvent('suffix-click', { value: inputValue }, evnt);
             }
         },
+        handleArrowInputDate(evnt, isUpArrow) {
+            const $xeDatePicker = this;
+            const props = $xeDatePicker;
+            const reactData = $xeDatePicker.reactData;
+            const internalData = $xeDatePicker.internalData;
+            const { multiple } = props;
+            if (multiple) {
+                return;
+            }
+            const { inputValue } = reactData;
+            if (!inputValue) {
+                return;
+            }
+            const targetElem = $xeDatePicker.$refs.refInputTarget;
+            if (!targetElem) {
+                return;
+            }
+            const { parseInputKayMaps } = internalData;
+            const inputFormat = $xeDatePicker.computeDateInputFormat;
+            const selectionStart = targetElem.selectionStart || 0;
+            let selectKey = inputFormat[selectionStart];
+            if (!parseInputKayMaps[selectKey]) {
+                selectKey = inputFormat[selectionStart - 1];
+            }
+            const inputPaesrFn = parseInputKayMaps[selectKey];
+            if (inputPaesrFn) {
+                inputPaesrFn(evnt, targetElem, isUpArrow);
+            }
+        },
         blurEvent(evnt) {
             const $xeDatePicker = this;
             const reactData = $xeDatePicker.reactData;
@@ -498,6 +544,14 @@ export default {
         },
         keydownEvent(evnt) {
             const $xeDatePicker = this;
+            const props = $xeDatePicker;
+            const { controlConfig } = props;
+            const controlOpts = $xeDatePicker.computeControlOpts;
+            const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
+            const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
+            if ((isUpArrow || isDwArrow) && controlOpts.isArrow && (controlConfig || controlOpts.enabled)) {
+                $xeDatePicker.handleArrowInputDate(evnt, isUpArrow);
+            }
             $xeDatePicker.triggerEvent(evnt);
         },
         keyupEvent(evnt) {
@@ -641,6 +695,9 @@ export default {
             const { panelIndex } = reactData;
             const targetElem = $xeDatePicker.$refs.refInputTarget;
             const panelElem = $xeDatePicker.$refs.refInputPanel;
+            if (!panelElem) {
+                return $xeDatePicker.$nextTick();
+            }
             const btnTransfer = $xeDatePicker.computeBtnTransfer;
             const popupOpts = $xeDatePicker.computePopupOpts;
             const handleStyle = () => {
@@ -667,13 +724,9 @@ export default {
             const btnTransfer = $xeDatePicker.computeBtnTransfer;
             const panelElem = $xeDatePicker.$refs.refInputPanel;
             if (!isDisabled && !visiblePanel) {
-                if (!reactData.initialized) {
+                if (!reactData.initialized && btnTransfer && panelElem) {
                     reactData.initialized = true;
-                    if (btnTransfer) {
-                        if (panelElem) {
-                            document.body.appendChild(panelElem);
-                        }
-                    }
+                    document.body.appendChild(panelElem);
                 }
                 if (internalData.hpTimeout) {
                     clearTimeout(internalData.hpTimeout);
@@ -700,10 +753,17 @@ export default {
         },
         clickIconEvent(evnt) {
             const $xeDatePicker = this;
+            const reactData = $xeDatePicker.reactData;
+            const { visiblePanel } = reactData;
             const popupOpts = $xeDatePicker.computePopupOpts;
             const { trigger } = popupOpts;
             if (!trigger || trigger === 'default' || trigger === 'icon') {
-                $xeDatePicker.datePickerOpenEvent(evnt);
+                if (visiblePanel) {
+                    $xeDatePicker.hidePanel();
+                }
+                else {
+                    $xeDatePicker.datePickerOpenEvent(evnt);
+                }
             }
         },
         clickEvent(evnt) {
@@ -833,6 +893,10 @@ export default {
             const props = $xeDatePicker;
             const slots = $xeDatePicker.$scopedSlots;
             const reactData = $xeDatePicker.reactData;
+            const popupOpts = $xeDatePicker.computePopupOpts;
+            if (popupOpts.enabled === false) {
+                return renderEmptyElement($xeDatePicker);
+            }
             const { type, multiple, showClearButton, showConfirmButton } = props;
             const { initialized, isAniVisible, visiblePanel, panelPlacement, panelStyle, inputValue } = reactData;
             const vSize = $xeDatePicker.computeSize;
@@ -842,7 +906,6 @@ export default {
             const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
             const shortcutList = $xeDatePicker.computeShortcutList;
             const timeOpts = $xeDatePicker.computeTimeOpts;
-            const popupOpts = $xeDatePicker.computePopupOpts;
             const { position } = shortcutOpts;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
@@ -1151,6 +1214,14 @@ export default {
     },
     created() {
         const $xeDatePicker = this;
+        const internalData = $xeDatePicker.internalData;
+        const { parseInputKayMaps } = internalData;
+        const inputKeys = ['y', 'M', 'd', 'H', 'm', 'n'];
+        inputKeys.forEach(key => {
+            parseInputKayMaps[key] = (evnt) => {
+                evnt.preventDefault();
+            };
+        });
         $xeDatePicker.updateModelValue();
         globalEvents.on($xeDatePicker, 'mousewheel', $xeDatePicker.handleGlobalMousewheelEvent);
         globalEvents.on($xeDatePicker, 'mousedown', $xeDatePicker.handleGlobalMousedownEvent);

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

@@ -533,6 +533,9 @@ export default {
             if (!trigger || trigger === 'default') {
                 $xeDateRangePicker.dateRangePickerOpenEvent(evnt);
             }
+            else if (trigger === 'icon') {
+                $xeDateRangePicker.hidePanel();
+            }
             $xeDateRangePicker.triggerEvent(evnt);
         },
         clickPrefixEvent(evnt) {
@@ -891,6 +894,9 @@ export default {
             const { panelIndex } = reactData;
             const targetElem = $xeDateRangePicker.$refs.refInputTarget;
             const panelElem = $xeDateRangePicker.$refs.refInputPanel;
+            if (!panelElem) {
+                return $xeDateRangePicker.$nextTick();
+            }
             const btnTransfer = $xeDateRangePicker.computeBtnTransfer;
             const popupOpts = $xeDateRangePicker.computePopupOpts;
             const handleStyle = () => {
@@ -917,13 +923,9 @@ export default {
             const btnTransfer = $xeDateRangePicker.computeBtnTransfer;
             const panelElem = $xeDateRangePicker.$refs.refInputPanel;
             if (!isDisabled && !visiblePanel) {
-                if (!reactData.initialized) {
+                if (!reactData.initialized && btnTransfer && panelElem) {
                     reactData.initialized = true;
-                    if (btnTransfer) {
-                        if (panelElem) {
-                            document.body.appendChild(panelElem);
-                        }
-                    }
+                    document.body.appendChild(panelElem);
                 }
                 if (internalData.hpTimeout) {
                     clearTimeout(internalData.hpTimeout);
@@ -951,10 +953,17 @@ export default {
         },
         clickIconEvent(evnt) {
             const $xeDateRangePicker = this;
+            const reactData = $xeDateRangePicker.reactData;
+            const { visiblePanel } = reactData;
             const popupOpts = $xeDateRangePicker.computePopupOpts;
             const { trigger } = popupOpts;
             if (!trigger || trigger === 'default' || trigger === 'icon') {
-                $xeDateRangePicker.dateRangePickerOpenEvent(evnt);
+                if (visiblePanel) {
+                    $xeDateRangePicker.hidePanel();
+                }
+                else {
+                    $xeDateRangePicker.dateRangePickerOpenEvent(evnt);
+                }
             }
         },
         clickEvent(evnt) {
@@ -1095,6 +1104,10 @@ export default {
             const props = $xeDateRangePicker;
             const slots = $xeDateRangePicker.$scopedSlots;
             const reactData = $xeDateRangePicker.reactData;
+            const popupOpts = $xeDateRangePicker.computePopupOpts;
+            if (popupOpts.enabled === false) {
+                return renderEmptyElement($xeDateRangePicker);
+            }
             const { type, separator, autoClose, showConfirmButton, showClearButton } = props;
             const { initialized, isAniVisible, visiblePanel, panelPlacement, panelStyle, startValue, endValue } = reactData;
             const vSize = $xeDateRangePicker.computeSize;
@@ -1107,7 +1120,6 @@ export default {
             const defaultDates = $xeDateRangePicker.computeDefaultDates;
             const defaultTimes = $xeDateRangePicker.computeDefaultTimes;
             const timeOpts = $xeDateRangePicker.computeTimeOpts;
-            const popupOpts = $xeDateRangePicker.computePopupOpts;
             const { startLabel, endLabel } = panelLabelObj;
             const { position } = shortcutOpts;
             const headerSlot = slots.header;

package/es/number-input/src/number-input.js

@@ -59,7 +59,6 @@ export default {
             type: String,
             default: () => getConfig().numberInput.size || getConfig().size
         },
-        // number、integer、float
         min: {
             type: [String, Number],
             default: null
@@ -82,12 +81,12 @@ export default {
             default: () => getConfig().numberInput.currencySymbol
         },
         controlConfig: Object,
-        // float
+        // number、float、amount
         roundingMode: {
             type: String,
             default: () => getConfig().numberInput.roundingMode
         },
-        // float
+        // float、amount
         digits: {
             type: [String, Number],
             default: null

package/es/splitter/src/splitter.js

@@ -45,7 +45,8 @@ export default {
             staticItems: [],
             itemList: [],
             barWidth: 0,
-            barHeight: 0
+            barHeight: 0,
+            resizeFlag: 0
         };
         const internalData = {
             wrapperWidth: 0,
@@ -572,6 +573,7 @@ export default {
             document.onmousemove = (evnt) => {
                 evnt.preventDefault();
                 handleDrag(evnt);
+                reactData.resizeFlag++;
             };
             document.onmouseup = (evnt) => {
                 document.onmousemove = null;
@@ -583,6 +585,7 @@ export default {
                 removeClass(el, 'is--drag');
                 $xeSplitter.dispatchEvent('resize-end', { prevItem, nextItem, offsetHeight: targetOffsetHeight, offsetWidth: targetOffsetWidth }, evnt);
                 $xeSplitter.recalculate();
+                reactData.resizeFlag++;
             };
             if (rsSplitterLineEl) {
                 rsSplitterLineEl.style.display = 'block';
@@ -595,6 +598,7 @@ export default {
         handleItemActionEvent(evnt, prevItem, nextItem, isNext) {
             const $xeSplitter = this;
             const props = $xeSplitter;
+            const reactData = $xeSplitter.reactData;
             const { vertical } = props;
             let expanded = false;
             let item = prevItem;
@@ -639,6 +643,7 @@ export default {
                 $xeSplitter.dispatchEvent('toggle-expand', { prevItem, nextItem, expanded, item }, evnt);
             }
             $xeSplitter.recalculate();
+            reactData.resizeFlag++;
         },
         handlePrevActionDblclickEvent(evnt) {
             const $xeSplitter = this;

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.15.1";
+export const version = "3.15.2";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.15.1"}`;
+const version = `ui v${"3.15.2"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getDateByCode = getDateByCode;
 exports.getDateQuarter = getDateQuarter;
 exports.getRangeDateByCode = getRangeDateByCode;
+exports.handleInputFormat = handleInputFormat;
 exports.handleValueFormat = handleValueFormat;
 exports.hasDateValueType = hasDateValueType;
 exports.hasTimestampValueType = hasTimestampValueType;
@@ -34,6 +35,18 @@ function handleValueFormat(type, valueFormat) {
   }
   return 'yyyy-MM-dd';
 }
+function handleInputFormat(type, inputFormat) {
+  if (inputFormat) {
+    return inputFormat;
+  }
+  if (type === 'time') {
+    return 'HH:mm:ss';
+  }
+  if (type === 'datetime') {
+    return 'yyyy-MM-dd HH:mm:ss';
+  }
+  return 'yyyy-MM-dd';
+}
 function toStringTimeDate(str) {
   var rest = new Date(2e3, 0, 1);
   if (str) {

package/lib/date-panel/src/util.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.getDateByCode=getDateByCode,exports.getDateQuarter=getDateQuarter,exports.getRangeDateByCode=getRangeDateByCode,exports.handleValueFormat=handleValueFormat,exports.hasDateValueType=hasDateValueType,exports.hasTimestampValueType=hasTimestampValueType,exports.parseDateObj=parseDateObj,exports.parseDateValue=exports.parseDateString=void 0,exports.toStringTimeDate=toStringTimeDate;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function hasTimestampValueType(e){return"timestamp"===e}function hasDateValueType(e){return"date"===e}function handleValueFormat(e,t){return!t||hasDateValueType(t)||hasTimestampValueType(t)?"time"===e?"HH:mm:ss":"datetime"===e?"yyyy-MM-dd HH:mm:ss":"yyyy-MM-dd":t}function toStringTimeDate(e){var t,a,s,r=new Date(2e3,0,1);return e&&(s=a=t=0,(_xeUtils.default.isNumber(e)||/^[0-9]{11,15}$/.test("".concat(e)))&&(e=new Date(Number(e))),_xeUtils.default.isDate(e)?(t=e.getHours(),a=e.getMinutes(),s=e.getSeconds()):(e=(e=_xeUtils.default.toValueString(e)).match(/^(\d{1,2})(:(\d{1,2}))?(:(\d{1,2}))?/))&&(t=_xeUtils.default.toNumber(e[1]),a=_xeUtils.default.toNumber(e[3]),s=_xeUtils.default.toNumber(e[5])),r.setHours(t),r.setMinutes(a),r.setSeconds(s)),r}function getDateQuarter(e){e=e.getMonth();return e<3?1:e<6?2:e<9?3:4}var parseDateValue=exports.parseDateValue=function(e,t,a){a=a.valueFormat;return e?"time"===t?toStringTimeDate(e):_xeUtils.default.isNumber(e)||/^[0-9]{10,15}$/.test("".concat(e))?new Date(Number(e)):_xeUtils.default.isString(e)?_xeUtils.default.toStringDate(_xeUtils.default.last(e.split(",")),a):_xeUtils.default.toStringDate(e,a):null},parseDateString=exports.parseDateString=function(e,t,a){e=parseDateValue(e,t,a);return e?_xeUtils.default.toDateString(e,a.valueFormat):""};function parseDateObj(e,t,a){var s=a.labelFormat,r=a.firstDay,l=null,u="";return e&&(l=parseDateValue(e,t,a)),_xeUtils.default.isValidDate(l)?(u=_xeUtils.default.toDateString(l,s,{firstDay:r}),s&&"week"===t&&(e=l.getFullYear(),a=l.getMonth()+1,t=_xeUtils.default.getYearWeek(l,r),checkWeekOfsetYear(t,a))&&(r=e+1,-1<(a=s.indexOf(t="yyyy")))&&(u=u.substring(0,a)+r+u.substring(a+t.length))):l=null,{label:u,value:l}}function getDateByCode(e,t,a,s){var r=s.valueFormat,l=s.firstDay,u=null,n=("prev"===e||"next"===e?new Date:t?parseDateValue(t,a,s):null)||new Date;switch(e){case"prev":case"next":case"minus":case"plus":var i="plus"===e||"next"===e?1:-1;switch(a){case"date":case"datetime":u=_xeUtils.default.getWhatDay(n,i);break;case"week":u=_xeUtils.default.getWhatWeek(n,i,l,l);break;case"month":u=_xeUtils.default.getWhatMonth(n,i);break;case"quarter":u=_xeUtils.default.getWhatQuarter(n,i);break;case"year":u=_xeUtils.default.getWhatYear(n,i)}break;default:u=new Date}return{value:u?_xeUtils.default.toDateString(u,r):""}}var rangeDateOffsetNumMaps={last180:-180,last90:-90,last60:-60,last30:-30,last7:-7,last3:-3,last1:-1};function getRangeDateOffsetNum(e){return rangeDateOffsetNumMaps[e]||0}function getRangeDateByCode(e,t,a,s){var r=s.valueFormat,l=s.firstDay,u=((t=_xeUtils.default.isArray(t)?t.join(""):t)?parseDateValue(t,a,s):null)||new Date,n=null,t=u;switch(e){case"last1":case"last3":case"last7":case"last30":case"last60":case"last90":case"last180":var i=getRangeDateOffsetNum(e);switch(a){case"date":case"datetime":n=_xeUtils.default.getWhatDay(u,i);break;case"week":n=_xeUtils.default.getWhatWeek(u,i,l,l);break;case"month":n=_xeUtils.default.getWhatMonth(u,i);break;case"quarter":n=_xeUtils.default.getWhatQuarter(u,i);break;case"year":n=_xeUtils.default.getWhatYear(u,i)}break;default:n=new Date}return{startValue:n?_xeUtils.default.toDateString(n,r):"",endValue:t?_xeUtils.default.toDateString(t,r):""}}var checkWeekOfsetYear=function(e,t){return"1"==="".concat(e)&&"12"==="".concat(t)};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.getDateByCode=getDateByCode,exports.getDateQuarter=getDateQuarter,exports.getRangeDateByCode=getRangeDateByCode,exports.handleInputFormat=handleInputFormat,exports.handleValueFormat=handleValueFormat,exports.hasDateValueType=hasDateValueType,exports.hasTimestampValueType=hasTimestampValueType,exports.parseDateObj=parseDateObj,exports.parseDateValue=exports.parseDateString=void 0,exports.toStringTimeDate=toStringTimeDate;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function hasTimestampValueType(e){return"timestamp"===e}function hasDateValueType(e){return"date"===e}function handleValueFormat(e,t){return!t||hasDateValueType(t)||hasTimestampValueType(t)?"time"===e?"HH:mm:ss":"datetime"===e?"yyyy-MM-dd HH:mm:ss":"yyyy-MM-dd":t}function handleInputFormat(e,t){return t||("time"===e?"HH:mm:ss":"datetime"===e?"yyyy-MM-dd HH:mm:ss":"yyyy-MM-dd")}function toStringTimeDate(e){var t,a,s,r=new Date(2e3,0,1);return e&&(s=a=t=0,(_xeUtils.default.isNumber(e)||/^[0-9]{11,15}$/.test("".concat(e)))&&(e=new Date(Number(e))),_xeUtils.default.isDate(e)?(t=e.getHours(),a=e.getMinutes(),s=e.getSeconds()):(e=(e=_xeUtils.default.toValueString(e)).match(/^(\d{1,2})(:(\d{1,2}))?(:(\d{1,2}))?/))&&(t=_xeUtils.default.toNumber(e[1]),a=_xeUtils.default.toNumber(e[3]),s=_xeUtils.default.toNumber(e[5])),r.setHours(t),r.setMinutes(a),r.setSeconds(s)),r}function getDateQuarter(e){e=e.getMonth();return e<3?1:e<6?2:e<9?3:4}var parseDateValue=exports.parseDateValue=function(e,t,a){a=a.valueFormat;return e?"time"===t?toStringTimeDate(e):_xeUtils.default.isNumber(e)||/^[0-9]{10,15}$/.test("".concat(e))?new Date(Number(e)):_xeUtils.default.isString(e)?_xeUtils.default.toStringDate(_xeUtils.default.last(e.split(",")),a):_xeUtils.default.toStringDate(e,a):null},parseDateString=exports.parseDateString=function(e,t,a){e=parseDateValue(e,t,a);return e?_xeUtils.default.toDateString(e,a.valueFormat):""};function parseDateObj(e,t,a){var s=a.labelFormat,r=a.firstDay,l=null,u="";return e&&(l=parseDateValue(e,t,a)),_xeUtils.default.isValidDate(l)?(u=_xeUtils.default.toDateString(l,s,{firstDay:r}),s&&"week"===t&&(e=l.getFullYear(),a=l.getMonth()+1,t=_xeUtils.default.getYearWeek(l,r),checkWeekOfsetYear(t,a))&&(r=e+1,-1<(a=s.indexOf(t="yyyy")))&&(u=u.substring(0,a)+r+u.substring(a+t.length))):l=null,{label:u,value:l}}function getDateByCode(e,t,a,s){var r=s.valueFormat,l=s.firstDay,u=null,n=("prev"===e||"next"===e?new Date:t?parseDateValue(t,a,s):null)||new Date;switch(e){case"prev":case"next":case"minus":case"plus":var i="plus"===e||"next"===e?1:-1;switch(a){case"date":case"datetime":u=_xeUtils.default.getWhatDay(n,i);break;case"week":u=_xeUtils.default.getWhatWeek(n,i,l,l);break;case"month":u=_xeUtils.default.getWhatMonth(n,i);break;case"quarter":u=_xeUtils.default.getWhatQuarter(n,i);break;case"year":u=_xeUtils.default.getWhatYear(n,i)}break;default:u=new Date}return{value:u?_xeUtils.default.toDateString(u,r):""}}var rangeDateOffsetNumMaps={last180:-180,last90:-90,last60:-60,last30:-30,last7:-7,last3:-3,last1:-1};function getRangeDateOffsetNum(e){return rangeDateOffsetNumMaps[e]||0}function getRangeDateByCode(e,t,a,s){var r=s.valueFormat,l=s.firstDay,u=((t=_xeUtils.default.isArray(t)?t.join(""):t)?parseDateValue(t,a,s):null)||new Date,n=null,t=u;switch(e){case"last1":case"last3":case"last7":case"last30":case"last60":case"last90":case"last180":var i=getRangeDateOffsetNum(e);switch(a){case"date":case"datetime":n=_xeUtils.default.getWhatDay(u,i);break;case"week":n=_xeUtils.default.getWhatWeek(u,i,l,l);break;case"month":n=_xeUtils.default.getWhatMonth(u,i);break;case"quarter":n=_xeUtils.default.getWhatQuarter(u,i);break;case"year":n=_xeUtils.default.getWhatYear(u,i)}break;default:n=new Date}return{startValue:n?_xeUtils.default.toDateString(n,r):"",endValue:t?_xeUtils.default.toDateString(t,r):""}}var checkWeekOfsetYear=function(e,t){return"1"==="".concat(e)&&"12"==="".concat(t)};

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

@@ -99,6 +99,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     labelFormat: String,
     valueFormat: String,
     timeFormat: String,
+    inputFormat: String,
     editable: {
       type: Boolean,
       default: true
@@ -140,6 +141,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         return (0, _ui.getConfig)().datePicker.autoClose;
       }
     },
+    controlConfig: Object,
     prefixIcon: String,
     suffixIcon: String,
     placement: String,
@@ -191,7 +193,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       inputLabel: ''
     };
     var internalData = {
-      hpTimeout: undefined
+      // hpTimeout: undefined,
+      parseInputKayMaps: {}
     };
     return {
       xID: xID,
@@ -335,6 +338,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         valueFormat = props.valueFormat;
       return (0, _util.handleValueFormat)(type, valueFormat);
     },
+    computeDateInputFormat: function computeDateInputFormat() {
+      var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      var type = props.type,
+        inputFormat = props.inputFormat;
+      return (0, _util.handleInputFormat)(type, inputFormat);
+    },
     computeFirstDayOfWeek: function computeFirstDayOfWeek() {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
@@ -360,6 +370,11 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         });
         return dateObj.label;
       }).join(', ');
+    },
+    computeControlOpts: function computeControlOpts() {
+      var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      return Object.assign({}, (0, _ui.getConfig)().datePicker.controlConfig, props.controlConfig);
     }
   }),
   methods: {
@@ -482,6 +497,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       reactData.isActivated = true;
       if (!trigger || trigger === 'default') {
         $xeDatePicker.datePickerOpenEvent(evnt);
+      } else if (trigger === 'icon') {
+        $xeDatePicker.hidePanel();
       }
       $xeDatePicker.triggerEvent(evnt);
     },
@@ -530,6 +547,35 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         }, evnt);
       }
     },
+    handleArrowInputDate: function handleArrowInputDate(evnt, isUpArrow) {
+      var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      var reactData = $xeDatePicker.reactData;
+      var internalData = $xeDatePicker.internalData;
+      var multiple = props.multiple;
+      if (multiple) {
+        return;
+      }
+      var inputValue = reactData.inputValue;
+      if (!inputValue) {
+        return;
+      }
+      var targetElem = $xeDatePicker.$refs.refInputTarget;
+      if (!targetElem) {
+        return;
+      }
+      var parseInputKayMaps = internalData.parseInputKayMaps;
+      var inputFormat = $xeDatePicker.computeDateInputFormat;
+      var selectionStart = targetElem.selectionStart || 0;
+      var selectKey = inputFormat[selectionStart];
+      if (!parseInputKayMaps[selectKey]) {
+        selectKey = inputFormat[selectionStart - 1];
+      }
+      var inputPaesrFn = parseInputKayMaps[selectKey];
+      if (inputPaesrFn) {
+        inputPaesrFn(evnt, targetElem, isUpArrow);
+      }
+    },
     blurEvent: function blurEvent(evnt) {
       var $xeDatePicker = this;
       var reactData = $xeDatePicker.reactData;
@@ -559,6 +605,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     },
     keydownEvent: function keydownEvent(evnt) {
       var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      var controlConfig = props.controlConfig;
+      var controlOpts = $xeDatePicker.computeControlOpts;
+      var isUpArrow = _ui.globalEvents.hasKey(evnt, _ui.GLOBAL_EVENT_KEYS.ARROW_UP);
+      var isDwArrow = _ui.globalEvents.hasKey(evnt, _ui.GLOBAL_EVENT_KEYS.ARROW_DOWN);
+      if ((isUpArrow || isDwArrow) && controlOpts.isArrow && (controlConfig || controlOpts.enabled)) {
+        $xeDatePicker.handleArrowInputDate(evnt, isUpArrow);
+      }
       $xeDatePicker.triggerEvent(evnt);
     },
     keyupEvent: function keyupEvent(evnt) {
@@ -704,6 +758,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var panelIndex = reactData.panelIndex;
       var targetElem = $xeDatePicker.$refs.refInputTarget;
       var panelElem = $xeDatePicker.$refs.refInputPanel;
+      if (!panelElem) {
+        return $xeDatePicker.$nextTick();
+      }
       var btnTransfer = $xeDatePicker.computeBtnTransfer;
       var popupOpts = $xeDatePicker.computePopupOpts;
       var handleStyle = function handleStyle() {
@@ -730,13 +787,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var btnTransfer = $xeDatePicker.computeBtnTransfer;
       var panelElem = $xeDatePicker.$refs.refInputPanel;
       if (!isDisabled && !visiblePanel) {
-        if (!reactData.initialized) {
+        if (!reactData.initialized && btnTransfer && panelElem) {
           reactData.initialized = true;
-          if (btnTransfer) {
-            if (panelElem) {
-              document.body.appendChild(panelElem);
-            }
-          }
+          document.body.appendChild(panelElem);
         }
         if (internalData.hpTimeout) {
           clearTimeout(internalData.hpTimeout);
@@ -763,10 +816,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     },
     clickIconEvent: function clickIconEvent(evnt) {
       var $xeDatePicker = this;
+      var reactData = $xeDatePicker.reactData;
+      var visiblePanel = reactData.visiblePanel;
       var popupOpts = $xeDatePicker.computePopupOpts;
       var trigger = popupOpts.trigger;
       if (!trigger || trigger === 'default' || trigger === 'icon') {
-        $xeDatePicker.datePickerOpenEvent(evnt);
+        if (visiblePanel) {
+          $xeDatePicker.hidePanel();
+        } else {
+          $xeDatePicker.datePickerOpenEvent(evnt);
+        }
       }
     },
     clickEvent: function clickEvent(evnt) {
@@ -898,6 +957,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var props = $xeDatePicker;
       var slots = $xeDatePicker.$scopedSlots;
       var reactData = $xeDatePicker.reactData;
+      var popupOpts = $xeDatePicker.computePopupOpts;
+      if (popupOpts.enabled === false) {
+        return (0, _ui.renderEmptyElement)($xeDatePicker);
+      }
       var type = props.type,
         multiple = props.multiple,
         showClearButton = props.showClearButton,
@@ -915,7 +978,6 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
       var shortcutList = $xeDatePicker.computeShortcutList;
       var timeOpts = $xeDatePicker.computeTimeOpts;
-      var popupOpts = $xeDatePicker.computePopupOpts;
       var position = shortcutOpts.position;
       var headerSlot = slots.header;
       var footerSlot = slots.footer;
@@ -1143,6 +1205,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
   },
   created: function created() {
     var $xeDatePicker = this;
+    var internalData = $xeDatePicker.internalData;
+    var parseInputKayMaps = internalData.parseInputKayMaps;
+    var inputKeys = ['y', 'M', 'd', 'H', 'm', 'n'];
+    inputKeys.forEach(function (key) {
+      parseInputKayMaps[key] = function (evnt) {
+        evnt.preventDefault();
+      };
+    });
     $xeDatePicker.updateModelValue();
     _ui.globalEvents.on($xeDatePicker, 'mousewheel', $xeDatePicker.handleGlobalMousewheelEvent);
     _ui.globalEvents.on($xeDatePicker, 'mousedown', $xeDatePicker.handleGlobalMousedownEvent);