vxe-pc-ui 3.3.66 → 3.3.68

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

@@ -12846,14 +12846,14 @@ var defineVxeComponent = function defineVxeComponent(options) {
 };
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.66");
+var log_version = "ui v".concat("3.3.68");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-var ui_version = "3.3.66";
+var ui_version = "3.3.68";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -12934,7 +12934,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,
@@ -15407,6 +15413,19 @@ function _toConsumableArray(r) {
       }
       return false;
     },
+    computeBtnAlign: function computeBtnAlign() {
+      var $xeButton = this;
+      var props = $xeButton;
+      var align = props.align;
+      var $xeButtonGroup = $xeButton.$xeButtonGroup;
+      if (align) {
+        return align;
+      }
+      if ($xeButtonGroup) {
+        return $xeButtonGroup.align;
+      }
+      return false;
+    },
     computeBtnCircle: function computeBtnCircle() {
       var $xeButton = this;
       var props = $xeButton;
@@ -15796,7 +15815,6 @@ function _toConsumableArray(r) {
       var reactData = $xeButton.reactData;
       var className = props.className,
         popupClassName = props.popupClassName,
-        align = props.align,
         trigger = props.trigger,
         title = props.title,
         routerLink = props.routerLink,
@@ -15812,6 +15830,7 @@ function _toConsumableArray(r) {
       var btnStatus = $xeButton.computeBtnStatus;
       var btnRound = $xeButton.computeBtnRound;
       var btnCircle = $xeButton.computeBtnCircle;
+      var btnAlign = $xeButton.computeBtnAlign;
       var btnDisabled = $xeButton.computeBtnDisabled;
       var permissionInfo = $xeButton.computePermissionInfo;
       var vSize = $xeButton.computeSize;
@@ -15836,7 +15855,7 @@ function _toConsumableArray(r) {
           }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--active', visiblePanel)]
         }, [routerLink ? h('router-link', {
           ref: 'refButton',
-          class: ['vxe-button', 'vxe-button--link', "type--".concat(btnMode), align ? "align--".concat(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--".concat(btnMode), btnAlign ? "align--".concat(btnAlign) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', btnDisabled || loading), 'is--loading', loading)],
           attrs: {
@@ -15854,7 +15873,7 @@ function _toConsumableArray(r) {
           class: "vxe-button--dropdown-arrow ".concat(getIcon().BUTTON_DROPDOWN)
         })])) : h('button', {
           ref: 'refButton',
-          class: ['vxe-button', "type--".concat(btnMode), align ? "align--".concat(align) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+          class: ['vxe-button', "type--".concat(btnMode), btnAlign ? "align--".concat(btnAlign) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', btnDisabled || loading), 'is--loading', loading)],
           attrs: {
@@ -15889,7 +15908,7 @@ function _toConsumableArray(r) {
       if (routerLink) {
         return h('router-link', {
           ref: 'refButton',
-          class: ['vxe-button', 'vxe-button--link', "type--".concat(btnMode), align ? "align--".concat(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--".concat(btnMode), btnAlign ? "align--".concat(btnAlign) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
             $button: $xeButton
           }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', btnDisabled || loading), 'is--loading', loading)],
           props: {
@@ -15909,7 +15928,7 @@ function _toConsumableArray(r) {
       }
       return h('button', {
         ref: 'refButton',
-        class: ['vxe-button', "type--".concat(btnMode), align ? "align--".concat(align) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        class: ['vxe-button', "type--".concat(btnMode), btnAlign ? "align--".concat(btnAlign) : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $button: $xeButton
         }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', btnDisabled || loading), 'is--loading', loading)],
         attrs: {
@@ -15991,6 +16010,7 @@ var es_array_find = __webpack_require__(113);
     round: Boolean,
     vertical: Boolean,
     circle: Boolean,
+    align: String,
     className: [String, Function],
     disabled: Boolean,
     permissionCode: [String, Number],
@@ -24068,6 +24088,7 @@ var Countdown = VxeCountdown;
 
 
 
+
 
 
 /* harmony default export */ var date_picker = (defineVxeComponent({
@@ -24171,6 +24192,7 @@ var Countdown = VxeCountdown;
       type: Boolean,
       default: null
     },
+    shortcutConfig: Object,
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     // 已废弃
@@ -24722,6 +24744,11 @@ var Countdown = VxeCountdown;
       var props = $xeDatePicker;
       var immediate = props.immediate;
       return immediate;
+    },
+    computeShortcutOpts: function computeShortcutOpts() {
+      var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      return Object.assign({}, getConfig().datePicker.shortcutConfig, props.shortcutConfig);
     }
   }),
   methods: {
@@ -24788,10 +24815,17 @@ var Countdown = VxeCountdown;
     parseDate: function parseDate(value, format) {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
-      var type = props.type;
+      var type = props.type,
+        multiple = props.multiple;
       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);
     },
     triggerEvent: function triggerEvent(evnt) {
@@ -24983,7 +25017,7 @@ var Countdown = VxeCountdown;
         reactData.selectMonth = month;
       }
     },
-    dateChange: function dateChange(date) {
+    dateChange: function dateChange(date, isReload) {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
       var reactData = $xeDatePicker.reactData;
@@ -25008,10 +25042,9 @@ var Countdown = VxeCountdown;
       $xeDatePicker.dateCheckMonth(date);
       if (multiple) {
         // 如果为多选
-        var dateMultipleValue = $xeDatePicker.computeDateMultipleValue;
         if (isDateTimeType) {
           // 如果是datetime特殊类型
-          var dateListValue = _toConsumableArray($xeDatePicker.computeDateListValue);
+          var dateListValue = isReload ? [] : _toConsumableArray($xeDatePicker.computeDateListValue);
           var datetimeRest = [];
           var eqIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(dateListValue, function (val) {
             return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, val, 'yyyyMMdd');
@@ -25037,6 +25070,7 @@ var Countdown = VxeCountdown;
             type: 'update'
           });
         } else {
+          var dateMultipleValue = isReload ? [] : $xeDatePicker.computeDateMultipleValue;
           // 如果是日期类型
           if (dateMultipleValue.some(function (val) {
             return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val, inpVal);
@@ -25162,8 +25196,23 @@ var Countdown = VxeCountdown;
     },
     dateNowHandle: function dateNowHandle() {
       var $xeDatePicker = this;
+      var props = $xeDatePicker;
       var reactData = $xeDatePicker.reactData;
-      var currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
+      var type = props.type;
+      var firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek;
+      var 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;
       $xeDatePicker.dateMonthHandle(currentDate, 0);
     },
@@ -25223,8 +25272,8 @@ var Countdown = VxeCountdown;
       var props = $xeDatePicker;
       var reactData = $xeDatePicker.reactData;
       $xeDatePicker.dateNowHandle();
+      $xeDatePicker.dateChange(reactData.currentDate, true);
       if (!props.multiple) {
-        $xeDatePicker.dateChange(reactData.currentDate);
         $xeDatePicker.hidePanel();
       }
       $xeDatePicker.dispatchEvent('date-today', {
@@ -25558,19 +25607,27 @@ var Countdown = VxeCountdown;
             offsetMonth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(offsetMonth, 4);
           }
           $xeDatePicker.dateMoveMonth(offsetMonth);
-        } else {
+        } else if (datePanelType === 'week') {
           var offsetDay = datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
           var firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek;
-          if (isLeftArrow) {
-            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(offsetDay, -1);
-          } else if (isUpArrow) {
+          if (isUpArrow) {
             offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(offsetDay, -1, firstDayOfWeek);
-          } 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);
           }
           $xeDatePicker.dateMoveDay(offsetDay);
+        } else {
+          var _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, _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, _offsetDay.getDay());
+          }
+          $xeDatePicker.dateMoveDay(_offsetDay);
         }
       }
     },
@@ -25751,6 +25808,25 @@ var Countdown = VxeCountdown;
       var $xeDatePicker = this;
       $xeDatePicker.triggerEvent(evnt);
     },
+    handleShortcutEvent: function handleShortcutEvent(_ref) {
+      var option = _ref.option,
+        $event = _ref.$event;
+      var $xeDatePicker = this;
+      var shortcutOpts = $xeDatePicker.computeShortcutOpts;
+      var autoClose = shortcutOpts.autoClose;
+      var clickMethod = option.clickMethod || shortcutOpts.clickMethod;
+      var shortcutParams = {
+        $datePicker: $xeDatePicker,
+        option: option
+      };
+      if (clickMethod) {
+        clickMethod(shortcutParams);
+      }
+      if (autoClose) {
+        $xeDatePicker.hidePanel();
+      }
+      $xeDatePicker.dispatchEvent('shortcut-click', shortcutParams, $event);
+    },
     // 全局事件
     handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
       var $xeDatePicker = this;
@@ -26303,6 +26379,30 @@ var Countdown = VxeCountdown;
         }, item.label);
       })) : renderEmptyElement($xeDatePicker)])];
     },
+    renderShortcutBtn: function renderShortcutBtn(h, pos, isVertical) {
+      var $xeDatePicker = this;
+      var shortcutOpts = $xeDatePicker.computeShortcutOpts;
+      var options = shortcutOpts.options,
+        position = shortcutOpts.position,
+        align = shortcutOpts.align,
+        mode = shortcutOpts.mode;
+      if (isEnableConf(shortcutOpts) && options && options.length && (position || 'left') === pos) {
+        return h('div', {
+          class: "vxe-date-picker--panel-".concat(pos, "-wrapper")
+        }, [h(button_group, {
+          props: {
+            options: options,
+            mode: mode,
+            align: align,
+            vertical: isVertical
+          },
+          on: {
+            click: $xeDatePicker.handleShortcutEvent
+          }
+        })]);
+      }
+      return renderEmptyElement($xeDatePicker);
+    },
     renderPanel: function renderPanel(h) {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
@@ -26316,12 +26416,16 @@ var Countdown = VxeCountdown;
         panelStyle = reactData.panelStyle;
       var vSize = $xeDatePicker.computeSize;
       var btnTransfer = $xeDatePicker.computeBtnTransfer;
+      var shortcutOpts = $xeDatePicker.computeShortcutOpts;
+      var options = shortcutOpts.options,
+        position = shortcutOpts.position;
       var headerSlot = slots.header;
       var footerSlot = slots.footer;
       var topSlot = slots.top;
       var bottomSlot = slots.bottom;
       var leftSlot = slots.left;
       var rightSlot = slots.right;
+      var hasShortcutBtn = options && options.length;
       var renders = [];
       if (type === 'datetime') {
         renders.push(h('div', {
@@ -26348,7 +26452,7 @@ var Countdown = VxeCountdown;
       }
       return h('div', {
         ref: 'refInputPanel',
-        class: ['vxe-table--ignore-clear vxe-date-picker--panel', "type--".concat(type), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--transfer', btnTransfer), 'ani--leave', isAniVisible), 'ani--enter', visiblePanel), 'show--top', !!(topSlot || headerSlot)), 'show--bottom', !!(bottomSlot || footerSlot)), 'show--left', !!leftSlot), 'show--right', !!rightSlot)],
+        class: ['vxe-table--ignore-clear vxe-date-picker--panel', "type--".concat(type), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--transfer', btnTransfer), 'ani--leave', isAniVisible), 'ani--enter', visiblePanel), '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'))],
         attrs: {
           placement: panelPlacement
         },
@@ -26357,23 +26461,23 @@ var Countdown = VxeCountdown;
         class: 'vxe-date-picker--panel-layout-wrapper'
       }, [topSlot ? h('div', {
         class: 'vxe-date-picker--panel-top-wrapper'
-      }, topSlot({})) : renderEmptyElement($xeDatePicker), h('div', {
+      }, topSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'top'), h('div', {
         class: 'vxe-date-picker--panel-body-layout-wrapper'
       }, [leftSlot ? h('div', {
         class: 'vxe-date-picker--panel-left-wrapper'
-      }, leftSlot({})) : renderEmptyElement($xeDatePicker), h('div', {
+      }, leftSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'left', true), h('div', {
         class: 'vxe-date-picker--panel-body-content-wrapper'
       }, [headerSlot ? h('div', {
         class: 'vxe-date-picker--panel-header-wrapper'
-      }, headerSlot({})) : renderEmptyElement($xeDatePicker), h('div', {
+      }, headerSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'header'), h('div', {
         class: 'vxe-date-picker--panel-body-wrapper'
       }, renders), footerSlot ? h('div', {
         class: 'vxe-date-picker--panel-footer-wrapper'
-      }, footerSlot({})) : renderEmptyElement($xeDatePicker)]), rightSlot ? h('div', {
+      }, footerSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'footer')]), rightSlot ? h('div', {
         class: 'vxe-date-picker--panel-right-wrapper'
-      }, rightSlot({})) : renderEmptyElement($xeDatePicker)]), bottomSlot ? h('div', {
+      }, rightSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'right', true)]), bottomSlot ? h('div', {
         class: 'vxe-date-picker--panel-bottom-wrapper'
-      }, bottomSlot({})) : renderEmptyElement($xeDatePicker)])] : []);
+      }, bottomSlot({})) : $xeDatePicker.renderShortcutBtn(h, 'bottom')])] : []);
     },
     renderPrefixIcon: function renderPrefixIcon(h) {
       var $xeDatePicker = this;