vxe-pc-ui 4.3.62 → 4.3.64

package/lib/image/style/style.css

@@ -1,3 +1,7 @@
+.vxe-image {
+  vertical-align: middle;
+  border-style: none;
+}
 .vxe-image.is--circle {
   border-radius: 50%;
 }

package/lib/image/style/style.min.css

@@ -1 +1 @@
-.vxe-image.is--circle{border-radius:50%}
+.vxe-image{vertical-align:middle;border-style:none}.vxe-image.is--circle{border-radius:50%}

package/lib/index.umd.js

@@ -4141,14 +4141,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.3.62"}`;
+const log_version = `ui v${"4.3.64"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.3.62";
+const ui_version = "4.3.64";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4229,7 +4229,13 @@ setConfig({
     startDate: new Date(1900, 0, 1),
     endDate: new Date(2100, 0, 1),
     startDay: 1,
-    selectDay: 1
+    selectDay: 1,
+    shortcutConfig: {
+      // position: 'left',
+      align: 'left',
+      mode: 'text',
+      autoClose: true
+    }
   },
   drawer: {
     // size: null,
@@ -6401,6 +6407,18 @@ function handleBooleanDefaultValue(value) {
       }
       return '';
     });
+    const computeBtnAlign = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        align
+      } = props;
+      if (align) {
+        return align;
+      }
+      if ($xeButtonGroup) {
+        return $xeButtonGroup.props.align;
+      }
+      return false;
+    });
     const computeBtnRound = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         round
@@ -6762,7 +6780,6 @@ function handleBooleanDefaultValue(value) {
       const {
         className,
         popupClassName,
-        align,
         trigger,
         title,
         routerLink,
@@ -6780,6 +6797,7 @@ function handleBooleanDefaultValue(value) {
       const btnMode = computeBtnMode.value;
       const btnStatus = computeBtnStatus.value;
       const btnRound = computeBtnRound.value;
+      const btnAlign = computeBtnAlign.value;
       const btnCircle = computeBtnCircle.value;
       const btnTransfer = computeBtnTransfer.value;
       const btnDisabled = computeBtnDisabled.value;
@@ -6809,7 +6827,7 @@ function handleBooleanDefaultValue(value) {
           }]
         }, [routerLink ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
           ref: refButton,
-          class: ['vxe-button', 'vxe-button--link', `type--${btnMode}`, align ? `align--${align}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+          class: ['vxe-button', 'vxe-button--link', `type--${btnMode}`, btnAlign ? `align--${btnAlign}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', {
             [`size--${vSize}`]: vSize,
@@ -6834,7 +6852,7 @@ function handleBooleanDefaultValue(value) {
           }
         }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
           ref: refButton,
-          class: ['vxe-button', `type--${btnMode}`, align ? `align--${align}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+          class: ['vxe-button', `type--${btnMode}`, btnAlign ? `align--${btnAlign}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', {
             [`size--${vSize}`]: vSize,
@@ -6876,7 +6894,7 @@ function handleBooleanDefaultValue(value) {
       if (routerLink) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
           ref: refButton,
-          class: ['vxe-button', 'vxe-button--link', `type--${btnMode}`, align ? `align--${align}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+          class: ['vxe-button', 'vxe-button--link', `type--${btnMode}`, btnAlign ? `align--${btnAlign}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', {
             [`size--${vSize}`]: vSize,
@@ -6902,7 +6920,7 @@ function handleBooleanDefaultValue(value) {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         ref: refButton,
-        class: ['vxe-button', `type--${btnMode}`, align ? `align--${align}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        class: ['vxe-button', `type--${btnMode}`, btnAlign ? `align--${btnAlign}` : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $button: $xeButton
         }) : className : '', {
           [`size--${vSize}`]: vSize,
@@ -6968,6 +6986,7 @@ const Button = VxeButton;
     round: Boolean,
     vertical: Boolean,
     circle: Boolean,
+    align: String,
     className: [String, Function],
     disabled: Boolean,
     permissionCode: [String, Number],
@@ -14182,6 +14201,7 @@ const Countdown = VxeCountdown;
 
 
 
+
 /* harmony default export */ var date_picker = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeDatePicker',
   props: {
@@ -14262,6 +14282,7 @@ const Countdown = VxeCountdown;
       type: Boolean,
       default: null
     },
+    shortcutConfig: Object,
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     // 已废弃
@@ -14269,7 +14290,7 @@ const Countdown = VxeCountdown;
     // 已废弃
     autocomplete: String
   },
-  emits: ['update:modelValue', 'input', 'change', 'keydown', 'keyup', 'wheel', 'click', 'focus', 'blur', 'clear', 'prefix-click', 'suffix-click', 'date-prev', 'date-today', 'date-next'],
+  emits: ['update:modelValue', 'input', 'change', 'keydown', 'keyup', 'wheel', 'click', 'focus', 'blur', 'clear', 'prefix-click', 'suffix-click', 'date-prev', 'date-today', 'date-next', 'shortcut-click'],
   setup(props, context) {
     const {
       slots,
@@ -14787,6 +14808,9 @@ const Countdown = VxeCountdown;
       } = props;
       return immediate;
     });
+    const computeShortcutOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, getConfig().datePicker.shortcutConfig, props.shortcutConfig);
+    });
     const updateModelValue = modelValue => {
       const {
         isActivated,
@@ -14807,18 +14831,25 @@ const Countdown = VxeCountdown;
     };
     const parseDate = (value, format) => {
       const {
-        type
+        type,
+        multiple
       } = props;
       if (type === 'time') {
         return toStringTimeDate(value);
       }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(value)) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(value[0], format);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(value)) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(multiple ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(value.split(',')) : value, format);
+      }
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(value, format);
     };
     const triggerEvent = evnt => {
       const {
         inputValue
       } = reactData;
-      datePickerMethods.dispatchEvent(evnt.type, {
+      dispatchEvent(evnt.type, {
         value: inputValue
       }, evnt);
     };
@@ -14826,7 +14857,7 @@ const Countdown = VxeCountdown;
       reactData.inputValue = value;
       emit('update:modelValue', value);
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(props.modelValue) !== value) {
-        datePickerMethods.dispatchEvent('change', {
+        dispatchEvent('change', {
           value
         }, evnt);
         // 自动更新校验状态
@@ -14845,7 +14876,7 @@ const Countdown = VxeCountdown;
         if (inpImmediate) {
           handleChange(value, evnt);
         } else {
-          datePickerMethods.dispatchEvent('input', {
+          dispatchEvent('input', {
             value
           }, evnt);
         }
@@ -14871,7 +14902,7 @@ const Countdown = VxeCountdown;
         const {
           inputValue
         } = reactData;
-        datePickerMethods.dispatchEvent('prefix-click', {
+        dispatchEvent('prefix-click', {
           value: inputValue
         }, evnt);
       }
@@ -14891,7 +14922,7 @@ const Countdown = VxeCountdown;
         hidePanel();
       }
       handleChange('', evnt);
-      datePickerMethods.dispatchEvent('clear', {
+      dispatchEvent('clear', {
         value
       }, evnt);
     };
@@ -14901,7 +14932,7 @@ const Countdown = VxeCountdown;
         const {
           inputValue
         } = reactData;
-        datePickerMethods.dispatchEvent('suffix-click', {
+        dispatchEvent('suffix-click', {
           value: inputValue
         }, evnt);
       }
@@ -14980,7 +15011,7 @@ const Countdown = VxeCountdown;
         reactData.selectMonth = month;
       }
     };
-    const dateChange = date => {
+    const dateChange = (date, isReload) => {
       const {
         modelValue,
         multiple
@@ -15007,10 +15038,9 @@ const Countdown = VxeCountdown;
       dateCheckMonth(date);
       if (multiple) {
         // 如果为多选
-        const dateMultipleValue = computeDateMultipleValue.value;
         if (isDateTimeType) {
           // 如果是datetime特殊类型
-          const dateListValue = [...computeDateListValue.value];
+          const dateListValue = isReload ? [] : [...computeDateListValue.value];
           const datetimeRest = [];
           const eqIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(dateListValue, val => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, val, 'yyyyMMdd'));
           if (eqIndex === -1) {
@@ -15032,6 +15062,7 @@ const Countdown = VxeCountdown;
             type: 'update'
           });
         } else {
+          const dateMultipleValue = isReload ? [] : computeDateMultipleValue.value;
           // 如果是日期类型
           if (dateMultipleValue.some(val => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val, inpVal))) {
             handleChange(dateMultipleValue.filter(val => !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val, inpVal)).join(','), {
@@ -15120,7 +15151,7 @@ const Countdown = VxeCountdown;
       if (!reactData.visiblePanel) {
         reactData.isActivated = false;
       }
-      datePickerMethods.dispatchEvent('blur', {
+      dispatchEvent('blur', {
         value
       }, evnt);
       // 自动更新校验状态
@@ -15146,7 +15177,23 @@ const Countdown = VxeCountdown;
       reactData.selectMonth = month;
     };
     const dateNowHandle = () => {
-      const currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
+      const {
+        type
+      } = props;
+      const firstDayOfWeek = computeFirstDayOfWeek.value;
+      let currentDate = new Date();
+      switch (type) {
+        case 'week':
+          currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(currentDate, 0, firstDayOfWeek);
+          break;
+        case 'datetime':
+          currentDate = new Date();
+          reactData.datetimePanelValue = new Date();
+          break;
+        default:
+          currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
+          break;
+      }
       reactData.currentDate = currentDate;
       dateMonthHandle(currentDate, 0);
     };
@@ -15195,7 +15242,7 @@ const Countdown = VxeCountdown;
           }
         }
         reactData.selectMonth = viewDate;
-        datePickerMethods.dispatchEvent('date-prev', {
+        dispatchEvent('date-prev', {
           viewType: datePanelType,
           viewDate,
           value,
@@ -15205,11 +15252,11 @@ const Countdown = VxeCountdown;
     };
     const dateTodayMonthEvent = evnt => {
       dateNowHandle();
+      dateChange(reactData.currentDate, true);
       if (!props.multiple) {
-        dateChange(reactData.currentDate);
         hidePanel();
       }
-      datePickerMethods.dispatchEvent('date-today', {
+      dispatchEvent('date-today', {
         type: props.type
       }, evnt);
     };
@@ -15247,7 +15294,7 @@ const Countdown = VxeCountdown;
           }
         }
         reactData.selectMonth = viewDate;
-        datePickerMethods.dispatchEvent('date-next', {
+        dispatchEvent('date-next', {
           viewType: datePanelType,
           value,
           type
@@ -15531,17 +15578,25 @@ const Countdown = VxeCountdown;
             offsetMonth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(offsetMonth, 4);
           }
           dateMoveMonth(offsetMonth);
-        } else {
+        } else if (datePanelType === 'week') {
           let offsetDay = datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
           const firstDayOfWeek = computeFirstDayOfWeek.value;
+          if (isUpArrow) {
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, -1, firstDayOfWeek);
+          } else if (isDwArrow) {
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, 1, firstDayOfWeek);
+          }
+          dateMoveDay(offsetDay);
+        } else {
+          let offsetDay = datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
           if (isLeftArrow) {
             offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(offsetDay, -1);
           } else if (isUpArrow) {
-            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, -1, firstDayOfWeek);
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, -1, offsetDay.getDay());
           } else if (isRightArrow) {
             offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(offsetDay, 1);
           } else if (isDwArrow) {
-            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, 1, firstDayOfWeek);
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, 1, offsetDay.getDay());
           }
           dateMoveDay(offsetDay);
         }
@@ -15714,7 +15769,27 @@ const Countdown = VxeCountdown;
     const clickEvent = evnt => {
       triggerEvent(evnt);
     };
-    // 弹出面板
+    const handleShortcutEvent = ({
+      option,
+      $event
+    }) => {
+      const shortcutOpts = computeShortcutOpts.value;
+      const {
+        autoClose
+      } = shortcutOpts;
+      const clickMethod = option.clickMethod || shortcutOpts.clickMethod;
+      const shortcutParams = {
+        $datePicker: $xeDatePicker,
+        option: option
+      };
+      if (clickMethod) {
+        clickMethod(shortcutParams);
+      }
+      if (autoClose) {
+        hidePanel();
+      }
+      dispatchEvent('shortcut-click', shortcutParams, $event);
+    };
     // 全局事件
     const handleGlobalMousedownEvent = evnt => {
       const {
@@ -16217,6 +16292,27 @@ const Countdown = VxeCountdown;
         }, item.label);
       })) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])];
     };
+    const renderShortcutBtn = (pos, isVertical) => {
+      const shortcutOpts = computeShortcutOpts.value;
+      const {
+        options,
+        position,
+        align,
+        mode
+      } = shortcutOpts;
+      if (isEnableConf(shortcutOpts) && options && options.length && (position || 'left') === pos) {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          class: `vxe-date-picker--panel-${pos}-wrapper`
+        }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(button_group, {
+          options,
+          mode,
+          align,
+          vertical: isVertical,
+          onClick: handleShortcutEvent
+        })]);
+      }
+      return renderEmptyElement($xeDatePicker);
+    };
     const renderPanel = () => {
       const {
         type
@@ -16230,12 +16326,18 @@ const Countdown = VxeCountdown;
       } = reactData;
       const vSize = computeSize.value;
       const btnTransfer = computeBtnTransfer.value;
+      const shortcutOpts = computeShortcutOpts.value;
+      const {
+        options,
+        position
+      } = shortcutOpts;
       const headerSlot = slots.header;
       const footerSlot = slots.footer;
       const topSlot = slots.top;
       const bottomSlot = slots.bottom;
       const leftSlot = slots.left;
       const rightSlot = slots.right;
+      const hasShortcutBtn = options && options.length;
       const renders = [];
       if (type === 'datetime') {
         renders.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -16270,10 +16372,10 @@ const Countdown = VxeCountdown;
           'is--transfer': btnTransfer,
           'ani--leave': isAniVisible,
           'ani--enter': visiblePanel,
-          'show--top': !!(topSlot || headerSlot),
-          'show--bottom': !!(bottomSlot || footerSlot),
-          'show--left': !!leftSlot,
-          'show--right': !!rightSlot
+          'show--top': !!(topSlot || headerSlot || hasShortcutBtn && (position === 'top' || position === 'header')),
+          'show--bottom': !!(bottomSlot || footerSlot || hasShortcutBtn && (position === 'bottom' || position === 'footer')),
+          'show--left': !!(leftSlot || hasShortcutBtn && position === 'left'),
+          'show--right': !!(rightSlot || hasShortcutBtn && position === 'right')
         }],
         placement: panelPlacement,
         style: panelStyle
@@ -16281,23 +16383,23 @@ const Countdown = VxeCountdown;
         class: 'vxe-date-picker--panel-layout-wrapper'
       }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-top-wrapper'
-      }, topSlot({})) : renderEmptyElement($xeDatePicker), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, topSlot({})) : renderShortcutBtn('top'), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-body-layout-wrapper'
       }, [leftSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-left-wrapper'
-      }, leftSlot({})) : renderEmptyElement($xeDatePicker), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, leftSlot({})) : renderShortcutBtn('left', true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-body-content-wrapper'
       }, [headerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-header-wrapper'
-      }, headerSlot({})) : renderEmptyElement($xeDatePicker), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, headerSlot({})) : renderShortcutBtn('header'), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-body-wrapper'
       }, renders), footerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-footer-wrapper'
-      }, footerSlot({})) : renderEmptyElement($xeDatePicker)]), rightSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, footerSlot({})) : renderShortcutBtn('footer')]), rightSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-right-wrapper'
-      }, rightSlot({})) : renderEmptyElement($xeDatePicker)]), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, rightSlot({})) : renderShortcutBtn('right', true)]), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-picker--panel-bottom-wrapper'
-      }, bottomSlot({})) : renderEmptyElement($xeDatePicker)])] : [])]);
+      }, bottomSlot({})) : renderShortcutBtn('bottom')])] : [])]);
     };
     const renderPrefixIcon = () => {
       const {