vxe-pc-ui 3.15.23 → 3.15.25

package/es/tooltip/src/tooltip.js

@@ -4,6 +4,28 @@ import { getConfig, createEvent, globalMixins } from '../../ui';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { toCssUnit } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
+function createReactData() {
+    return {
+        target: null,
+        isUpdate: false,
+        visible: false,
+        tipPos: null,
+        tipContent: '',
+        tipActive: false,
+        tipTarget: null,
+        tipZindex: 0,
+        tipStore: {
+            style: {},
+            placement: '',
+            arrowStyle: {}
+        }
+    };
+}
+function createInternalData() {
+    return {
+    // showDelayTip: undefined
+    };
+}
 export default {
     name: 'VxeTooltip',
     mixins: [
@@ -89,27 +111,10 @@ export default {
         }
     },
     data() {
-        const reactData = {
-            target: null,
-            isUpdate: false,
-            visible: false,
-            tipPos: null,
-            tipContent: '',
-            tipActive: false,
-            tipTarget: null,
-            tipZindex: 0,
-            tipStore: {
-                style: {},
-                placement: '',
-                arrowStyle: {}
-            }
-        };
-        const internalData = {};
-        return {
-            xID: XEUtils.uniqueId(),
-            reactData,
-            internalData
-        };
+        const xID = XEUtils.uniqueId();
+        const reactData = createReactData();
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeWrapperStyle() {
             const $xeTooltip = this;
@@ -573,6 +578,7 @@ export default {
     },
     created() {
         const $xeTooltip = this;
+        $xeTooltip.internalData = createInternalData();
         $xeTooltip.handleDelayFn();
     },
     mounted() {
@@ -638,6 +644,13 @@ export default {
             }
         }
     },
+    destroyed() {
+        const $xeTooltip = this;
+        const reactData = $xeTooltip.reactData;
+        const internalData = $xeTooltip.internalData;
+        XEUtils.assign(reactData, createReactData());
+        XEUtils.assign(internalData, createInternalData());
+    },
     render(h) {
         return this.renderVN(h);
     }

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.23";
+export const version = "3.15.25";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const uiVersion = `ui v${"3.15.23"}`;
+const uiVersion = `ui v${"3.15.25"}`;
 export function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

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

@@ -9,6 +9,7 @@ var _comp = require("../../ui/src/comp");
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _ui = require("../../ui");
 var _util = require("./util");
+var _log = require("../../ui/src/log");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
@@ -19,6 +20,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var _createComponentLog = (0, _log.createComponentLog)('date-panel'),
+  errLog = _createComponentLog.errLog;
 var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeDatePanel',
   mixins: [_ui.globalMixins.sizeMixin],
@@ -27,7 +30,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     event: 'modelValue'
   },
   props: {
-    value: [String, Number, Date],
+    value: [String, Number, Date, Array],
     type: {
       type: String,
       default: 'date'
@@ -60,6 +63,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         return (0, _ui.getConfig)().datePanel.endDate;
       }
     },
+    defaultMode: String,
     defaultDate: [String, Number, Date],
     defaultTime: [String, Number, Date],
     minDate: [String, Number, Date],
@@ -73,6 +77,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     labelFormat: String,
     valueFormat: String,
     timeFormat: String,
+    valueSort: Boolean,
     festivalMethod: {
       type: Function,
       default: function _default() {
@@ -110,9 +115,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       currentDate: null
     };
     var internalData = {
-      yearSize: 12,
-      monthSize: 20,
-      quarterSize: 8,
+      yearSize: 16,
+      monthSize: 12,
+      quarterSize: 4,
       hpTimeout: undefined
     };
     return {
@@ -122,17 +127,24 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     };
   },
   computed: Object.assign(Object.assign({}, {}), {
-    computeIsDateTimeType: function computeIsDateTimeType() {
+    computeIsTimeType: function computeIsTimeType() {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var type = props.type;
-      return type === 'time' || type === 'datetime';
+      return type === 'time';
+    },
+    computeIsTimeOrDateTimeType: function computeIsTimeOrDateTimeType() {
+      var $xeDatePanel = this;
+      var props = $xeDatePanel;
+      var type = props.type;
+      var isTimeType = $xeDatePanel.computeIsTimeType;
+      return isTimeType || type === 'datetime';
     },
     computeIsDatePanelType: function computeIsDatePanelType() {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
     },
     computeDateStartDate: function computeDateStartDate() {
       var $xeDatePanel = this;
@@ -148,19 +160,25 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var modelValue = props.value,
-        multiple = props.multiple;
+        valueFormat = props.valueFormat;
       var isDatePanelType = $xeDatePanel.computeIsDatePanelType;
       var dateValueFormat = $xeDatePanel.computeDateValueFormat;
-      if (multiple && modelValue && isDatePanelType) {
-        return _xeUtils.default.toValueString(modelValue).split(',').map(function (item) {
-          var date = $xeDatePanel.parseDate(item, dateValueFormat);
-          if (_xeUtils.default.isValidDate(date)) {
-            return date;
+      var restList = [];
+      if (modelValue && isDatePanelType) {
+        (_xeUtils.default.isArray(modelValue) ? modelValue : _xeUtils.default.toValueString(modelValue).split(',')).forEach(function (val) {
+          var strVal = val;
+          if (val) {
+            if (valueFormat === 'timestamp') {
+              if (_xeUtils.default.isString(val) && /^\d+$/.test(val)) {
+                strVal = Number(strVal);
+              }
+            }
+            var date = $xeDatePanel.parseDate(strVal, dateValueFormat);
+            restList.push(date);
           }
-          return date;
         });
       }
-      return [];
+      return restList;
     },
     computeDateMultipleValue: function computeDateMultipleValue() {
       var $xeDatePanel = this;
@@ -209,12 +227,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     computeDateValue: function computeDateValue() {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
-      var modelValue = props.value;
+      var modelValue = props.value,
+        defaultMode = props.defaultMode;
       var isDatePanelType = $xeDatePanel.computeIsDatePanelType;
       var dateValueFormat = $xeDatePanel.computeDateValueFormat;
       var val = null;
       if (modelValue && isDatePanelType) {
-        var date = $xeDatePanel.parseDate(modelValue, dateValueFormat);
+        var vals = _xeUtils.default.isString(modelValue) ? modelValue.split(',') : modelValue;
+        var currVal = defaultMode === 'last' ? _xeUtils.default.last(vals) : _xeUtils.default.first(vals);
+        var date = $xeDatePanel.parseDate(currVal, dateValueFormat);
         if (_xeUtils.default.isValidDate(date)) {
           val = date;
         }
@@ -255,8 +276,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     computeDateHMSTime: function computeDateHMSTime() {
       var $xeDatePanel = this;
       var dateValue = $xeDatePanel.computeDateValue;
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      return dateValue && isDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      return dateValue && isTimeOrDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
     },
     computeDateLabelFormat: function computeDateLabelFormat() {
       var $xeDatePanel = this;
@@ -280,7 +301,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         var currFullYear = currentDate.getFullYear();
         var selectFullYear = selectMonth.getFullYear();
         var startYearDate = new Date(selectFullYear - selectFullYear % yearSize, 0, 1);
-        for (var index = -4; index < yearSize + 4; index++) {
+        for (var index = 0; index < yearSize; index++) {
           var date = _xeUtils.default.getWhatYear(startYearDate, index, 'first');
           var itemFullYear = date.getFullYear();
           years.push({
@@ -392,7 +413,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         var currQuarter = (0, _util.getDateQuarter)(currentDate);
         var firstYear = _xeUtils.default.getWhatYear(selectMonth, 0, 'first');
         var selFullYear = firstYear.getFullYear();
-        for (var index = -2; index < quarterSize - 2; index++) {
+        for (var index = 0; index < quarterSize; index++) {
           var date = _xeUtils.default.getWhatQuarter(firstYear, index);
           var itemFullYear = date.getFullYear();
           var itemQuarter = (0, _util.getDateQuarter)(date);
@@ -426,7 +447,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         var currFullYear = currentDate.getFullYear();
         var currMonth = currentDate.getMonth();
         var selFullYear = _xeUtils.default.getWhatYear(selectMonth, 0, 'first').getFullYear();
-        for (var index = -4; index < monthSize - 4; index++) {
+        for (var index = 0; index < monthSize; index++) {
           var date = _xeUtils.default.getWhatYear(selectMonth, 0, index);
           var itemFullYear = date.getFullYear();
           var itemMonth = date.getMonth();
@@ -512,8 +533,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var hourOptions = timeOpts.hours,
         hourDisabledMethod = timeOpts.hourDisabledMethod;
       var list = [];
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      if (isDateTimeType) {
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      if (isTimeOrDateTimeType) {
         if (hourOptions && hourOptions.length) {
           hourOptions.forEach(function (item) {
             if (_xeUtils.default.isNumber(item) || _xeUtils.default.isString(item)) {
@@ -557,8 +578,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var minuteOptions = timeOpts.minutes,
         minuteDisabledMethod = timeOpts.minuteDisabledMethod;
       var list = [];
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      if (isDateTimeType) {
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      if (isTimeOrDateTimeType) {
         if (minuteOptions && minuteOptions.length) {
           minuteOptions.forEach(function (item) {
             if (_xeUtils.default.isNumber(item) || _xeUtils.default.isString(item)) {
@@ -616,8 +637,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var secondOptions = timeOpts.seconds,
         secondDisabledMethod = timeOpts.secondDisabledMethod;
       var list = [];
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      if (isDateTimeType) {
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      if (isTimeOrDateTimeType) {
         if (secondOptions && secondOptions.length) {
           secondOptions.forEach(function (item) {
             if (_xeUtils.default.isNumber(item) || _xeUtils.default.isString(item)) {
@@ -696,10 +717,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var type = props.type,
         multiple = props.multiple;
       if (type === 'time') {
-        return (0, _util.toStringTimeDate)(value);
+        return (0, _util.toStringTimeDate)(_xeUtils.default.isArray(value) ? _xeUtils.default.last(value) : value);
       }
       if (_xeUtils.default.isArray(value)) {
-        return _xeUtils.default.toStringDate(value[0], format);
+        return _xeUtils.default.toStringDate(_xeUtils.default.last(value), format);
       }
       if (_xeUtils.default.isString(value)) {
         return _xeUtils.default.toStringDate(multiple ? _xeUtils.default.last(value.split(',')) : value, format);
@@ -775,7 +796,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         });
       }
     },
-    handleChange: function handleChange(value, evnt) {
+    handleChange: function handleChange(value, evnt, params) {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var reactData = $xeDatePanel.reactData;
@@ -792,7 +813,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         $xeDatePanel.emitModel(timeNum);
         if (modelValue !== timeNum) {
           $xeDatePanel.dispatchEvent('change', {
-            value: timeNum
+            value: timeNum,
+            currValue: params ? params.currValue : ''
           }, evnt);
         }
       } else if ((0, _util.hasDateValueType)(valueFormat)) {
@@ -802,14 +824,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         $xeDatePanel.emitModel(_dateVal);
         if (modelValue && _dateVal ? _xeUtils.default.toStringDate(modelValue).getTime() !== _dateVal.getTime() : modelValue !== _dateVal) {
           $xeDatePanel.dispatchEvent('change', {
-            value: _dateVal
+            value: _dateVal,
+            currValue: params ? params.currValue : ''
           }, evnt);
         }
       } else {
         $xeDatePanel.emitModel(value);
         if (_xeUtils.default.toValueString(modelValue) !== value) {
           $xeDatePanel.dispatchEvent('change', {
-            value: value
+            value: value,
+            currValue: params ? params.currValue : ''
           }, evnt);
         }
       }
@@ -885,15 +909,17 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var props = $xeDatePanel;
       var reactData = $xeDatePanel.reactData;
       var modelValue = props.value,
-        multiple = props.multiple;
+        multiple = props.multiple,
+        valueSort = props.valueSort;
       var datetimePanelValue = reactData.datetimePanelValue;
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
+      var isTimeType = $xeDatePanel.computeIsTimeType;
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
       var dateValueFormat = $xeDatePanel.computeDateValueFormat;
       var firstDayOfWeek = $xeDatePanel.computeFirstDayOfWeek;
       if (props.type === 'week') {
         var sWeek = _xeUtils.default.toNumber(props.selectDay);
         date = _xeUtils.default.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
-      } else if (isDateTimeType) {
+      } else if (isTimeOrDateTimeType) {
         if (datetimePanelValue) {
           date.setHours(datetimePanelValue.getHours());
           date.setMinutes(datetimePanelValue.getMinutes());
@@ -904,10 +930,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         firstDay: firstDayOfWeek
       });
       $xeDatePanel.dateCheckMonth(date);
-      if (multiple) {
+      if (!isTimeType && multiple) {
         var overCount = $xeDatePanel.computeOverCount;
         // 如果为多选
-        if (isDateTimeType) {
+        if (isTimeOrDateTimeType) {
           // 如果是datetime特殊类型
           var dateListValue = isReload ? [] : _toConsumableArray($xeDatePanel.computeDateListValue);
           var datetimeRest = [];
@@ -933,37 +959,53 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
               datetimeRest.push(item);
             }
           });
+          // 排序
+          if (valueSort) {
+            datetimeRest = datetimeRest.sort(function (a, b) {
+              return a.getTime() - b.getTime();
+            });
+          }
           $xeDatePanel.handleChange(datetimeRest.map(function (date) {
             return _xeUtils.default.toDateString(date, dateValueFormat);
           }).join(','), {
             type: 'update'
+          }, {
+            currValue: inpVal
           });
         } else {
           var dateMultipleValue = isReload ? [] : $xeDatePanel.computeDateMultipleValue;
+          var dateRest = [];
           // 如果是日期类型
           if (dateMultipleValue.some(function (val) {
             return _xeUtils.default.isEqual(val, inpVal);
           })) {
-            $xeDatePanel.handleChange(dateMultipleValue.filter(function (val) {
+            dateRest = dateMultipleValue.filter(function (val) {
               return !_xeUtils.default.isEqual(val, inpVal);
-            }).join(','), {
-              type: 'update'
             });
           } 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.default.isEqual(modelValue, inpVal)) {
           $xeDatePanel.handleChange(inpVal, {
             type: 'update'
+          }, {
+            currValue: inpVal
           });
         }
       }
@@ -1311,17 +1353,19 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var multiple = props.multiple;
       var datetimePanelValue = reactData.datetimePanelValue;
       var dateValue = $xeDatePanel.computeDateValue;
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-      if (isDateTimeType) {
+      var isTimeType = $xeDatePanel.computeIsTimeType;
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+      if (isTimeOrDateTimeType) {
         var dateValueFormat = $xeDatePanel.computeDateValueFormat;
-        if (multiple) {
+        if (!isTimeType && multiple) {
           // 如果为多选
           var dateMultipleValue = $xeDatePanel.computeDateMultipleValue;
-          if (isDateTimeType) {
+          var dateListValue = $xeDatePanel.computeDateListValue;
+          if (isTimeOrDateTimeType) {
             // 如果是datetime特殊类型
-            var dateListValue = _toConsumableArray($xeDatePanel.computeDateListValue);
+            var listVals = dateListValue.length ? _toConsumableArray(dateListValue) : [];
             var datetimeRest = [];
-            dateListValue.forEach(function (item) {
+            listVals.forEach(function (item) {
               if (item) {
                 if (datetimePanelValue) {
                   item.setHours(datetimePanelValue.getHours());
@@ -1378,7 +1422,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var type = props.type,
         defaultDate = props.defaultDate,
         defaultTime = props.defaultTime;
-      var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
+      var isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
       var dateValue = $xeDatePanel.computeDateValue;
       if (['year', 'quarter', 'month', 'week'].indexOf(type) > -1) {
         reactData.datePanelType = type;
@@ -1402,7 +1446,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
           $xeDatePanel.dateNowHandle();
         }
       }
-      if (isDateTimeType) {
+      if (isTimeOrDateTimeType) {
         var dtPanelValue = reactData.datePanelValue;
         if (!dtPanelValue) {
           dtPanelValue = _xeUtils.default.getWhatDay(Date.now(), 0, 'first');
@@ -1429,6 +1473,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var reactData = $xeDatePanel.reactData;
       return reactData.inputValue;
     },
+    getViewType: function getViewType() {
+      var $xeDatePanel = this;
+      var reactData = $xeDatePanel.reactData;
+      var datePanelType = reactData.datePanelType;
+      return datePanelType;
+    },
     setPanelDate: function setPanelDate(date) {
       var $xeDatePanel = this;
       if (date) {
@@ -2066,6 +2116,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
   },
   created: function created() {
     var $xeDatePanel = this;
+    var props = $xeDatePanel;
+    var type = props.type,
+      multiple = props.multiple;
+    if (multiple && type === 'time') {
+      errLog('vxe.error.notSupportProp', ["type=".concat(type), 'multiple=true', 'multiple=false']);
+    }
     $xeDatePanel.initValue();
     $xeDatePanel.dateOpenPanel();
   },