vxe-pc-ui 3.15.24 → 3.15.26

package/lib/index.umd.js

@@ -5711,6 +5711,36 @@ $({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
 });
 
 
+/***/ }),
+
+/***/ 8980:
+/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__(6518);
+var $findIndex = (__webpack_require__(9213).findIndex);
+var addToUnscopables = __webpack_require__(6469);
+
+var FIND_INDEX = 'findIndex';
+var SKIPS_HOLES = true;
+
+// Shouldn't skip holes
+// eslint-disable-next-line es/no-array-prototype-findindex -- testing
+if (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; });
+
+// `Array.prototype.findIndex` method
+// https://tc39.es/ecma262/#sec-array.prototype.findindex
+$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  findIndex: function findIndex(callbackfn /* , that = undefined */) {
+    return $findIndex(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  }
+});
+
+// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables(FIND_INDEX);
+
+
 /***/ }),
 
 /***/ 113:
@@ -13226,7 +13256,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.15.24");
+var uiVersion = "ui v".concat("3.15.26");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13244,7 +13274,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.15.24";
+var ui_version = "3.15.26";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -13467,6 +13497,9 @@ setConfig({
   listView: {},
   list: {
     // size: null,
+    rowConfig: {
+      contentField: 'label'
+    },
     dragConfig: {
       showIcon: true,
       animation: true,
@@ -18540,7 +18573,7 @@ function parseDateValue(val, type, options) {
   var valueFormat = options.valueFormat;
   if (val) {
     if (type === 'time') {
-      return toStringTimeDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(val) ? val : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(val));
+      return toStringTimeDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(val) : val);
     }
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val) || /^[0-9]{10,15}$/.test("".concat(val))) {
       return new Date(Number(val));
@@ -18730,6 +18763,18 @@ function checkDateInputFormat(numStr, formatKey) {
   }
   return numVal;
 }
+var getPrevYear = function getPrevYear(date) {
+  var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var currtYear = date.getFullYear();
+  date.setFullYear(currtYear - size);
+  return date;
+};
+var getNextYear = function getNextYear(date) {
+  var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var currtYear = date.getFullYear();
+  date.setFullYear(currtYear + size);
+  return date;
+};
 var getPrevMonth = function getPrevMonth(date) {
   var currtYear = date.getFullYear();
   var currMonth = date.getMonth();
@@ -21318,6 +21363,8 @@ function enNodeValue(nodeid) {
 function deNodeValue(nodeid) {
   return nodeid ? decodeURIComponent("".concat(nodeid)) : nodeid;
 }
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find-index.js
+var es_array_find_index = __webpack_require__(8980);
 ;// ./packages/list/src/store.ts
 // 跨表拖拽
 var crossListDragRowGlobal = {
@@ -21391,6 +21438,15 @@ function clearColAnimate(elem, clss) {
     }
   }, 500);
 }
+;// ./packages/list/src/util.ts
+function getItemCacheObj(item) {
+  return {
+    item: item,
+    index: -1,
+    $index: -1,
+    _index: -1
+  };
+}
 ;// ./packages/list/src/list.ts
 
 
@@ -21419,12 +21475,17 @@ function clearColAnimate(elem, clss) {
 
 
 
+
+
+
 
 
 
 
 var list_createComponentLog = createComponentLog('tree'),
+  list_warnLog = list_createComponentLog.warnLog,
   list_errLog = list_createComponentLog.errLog;
+var crossListDragRowObj = null;
 function eqRowKey(rowKey1, rowKey2) {
   return '' + rowKey1 === '' + rowKey2;
 }
@@ -21454,15 +21515,20 @@ function list_createReactData() {
     updateCheckboxFlag: 1,
     isAllChecked: false,
     isAllIndeterminate: false,
+    insertRowFlag: 1,
+    removeRowFlag: 1,
     dragRow: null,
-    dragTipText: ''
+    dragTipText: '',
+    isCrossDragRow: false
   };
 }
 function list_createInternalData() {
   return {
     resizeObserver: undefined,
     fullData: [],
+    afterList: [],
     fullKeyMaps: {},
+    rowMaps: {},
     lastScrollLeft: 0,
     lastScrollTop: 0,
     scrollYStore: {
@@ -21473,7 +21539,9 @@ function list_createInternalData() {
       rowHeight: 0
     },
     currentRow: null,
-    selectCheckboxMaps: {}
+    selectCheckboxMaps: {},
+    insertRowMaps: {},
+    removeRowMaps: {}
     // prevDragRow: null,
     // prevDragPos: ''
   };
@@ -21500,6 +21568,12 @@ function list_createInternalData() {
       }
     },
     syncResize: [Boolean, String, Number],
+    showSeq: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().list.showSeq;
+      }
+    },
     showRadio: {
       type: Boolean,
       default: function _default() {
@@ -21518,6 +21592,7 @@ function list_createInternalData() {
     checkboxConfig: Object,
     rowConfig: Object,
     dragConfig: Object,
+    menuConfig: Object,
     virtualYConfig: Object,
     scrollY: Object
   },
@@ -21580,6 +21655,11 @@ function list_createInternalData() {
         showIcon: true
       }, getConfig().list.checkboxConfig, props.checkboxConfig);
     },
+    computeMenuOpts: function computeMenuOpts() {
+      var $xeList = this;
+      var props = $xeList;
+      return Object.assign({}, getConfig().list.menuConfig, props.menuConfig);
+    },
     computeWrapperStyles: function computeWrapperStyles() {
       var $xeList = this;
       var rowHeight = $xeList.computeRowHeight;
@@ -21688,6 +21768,30 @@ function list_createInternalData() {
       internalData.selectCheckboxMaps = selectMaps;
       $xeList.updateCheckboxStatus();
     },
+    updateAfterDataIndex: function updateAfterDataIndex() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var afterList = internalData.afterList,
+        rowMaps = internalData.rowMaps;
+      var keyField = $xeList.computeKeyField;
+      var vtIndex = 0;
+      afterList.forEach(function (item, index) {
+        var roweid = getRowIdByField(item, keyField);
+        var rowRest = rowMaps[roweid];
+        if (rowRest) {
+          rowRest._index = vtIndex;
+        } else {
+          var rest = {
+            item: item,
+            index: index,
+            $index: -1,
+            _index: vtIndex
+          };
+          rowMaps[roweid] = rest;
+        }
+        vtIndex++;
+      });
+    },
     cacheRowMap: function cacheRowMap() {
       var $xeList = this;
       var internalData = $xeList.internalData;
@@ -21710,17 +21814,21 @@ function list_createInternalData() {
       var internalData = $xeList.internalData;
       var scrollYStore = internalData.scrollYStore;
       var sYOpts = $xeList.computeSYOpts;
-      var fullData = datas || [];
+      var fullData = datas ? datas.slice(0) : [];
       Object.assign(scrollYStore, {
         startIndex: 0,
         endIndex: 1,
         visibleSize: 0
       });
       internalData.fullData = fullData;
+      internalData.insertRowMaps = {};
+      reactData.insertRowFlag++;
+      internalData.removeRowMaps = {};
+      reactData.removeRowFlag++;
       // 如果gt为0，则总是启用
       reactData.scrollYLoad = !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length);
       $xeList.cacheRowMap();
-      $xeList.handleData();
+      $xeList.handleData(true);
       $xeList.updateRadioModeValue();
       $xeList.updateCheckboxModeValue();
       return $xeList.computeScrollLoad().then(function () {
@@ -21783,14 +21891,37 @@ function list_createInternalData() {
       reactData.bodyHeight = scrollYLoad ? fullData.length * scrollYStore.rowHeight : 0;
       reactData.topSpaceHeight = scrollYLoad ? Math.max(scrollYStore.startIndex * scrollYStore.rowHeight, 0) : 0;
     },
-    handleData: function handleData() {
+    updateAfterFullData: function updateAfterFullData() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var fullData = internalData.fullData;
+      internalData.afterList = fullData.slice(0);
+      $xeList.updateAfterDataIndex();
+    },
+    handleData: function handleData(force) {
       var $xeList = this;
       var reactData = $xeList.reactData;
       var internalData = $xeList.internalData;
       var scrollYLoad = reactData.scrollYLoad;
       var fullData = internalData.fullData,
-        scrollYStore = internalData.scrollYStore;
-      reactData.rowList = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+        scrollYStore = internalData.scrollYStore,
+        rowMaps = internalData.rowMaps;
+      var keyField = $xeList.computeKeyField;
+      if (force) {
+        // 更新数据，处理筛选和排序
+        $xeList.updateAfterFullData();
+      }
+      var rowList = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+      if (keyField) {
+        rowList.forEach(function (item, $index) {
+          var rowid = getRowIdByField(item, keyField);
+          var rowRest = rowMaps[rowid];
+          if (rowRest) {
+            rowRest.$index = $index;
+          }
+        });
+      }
+      reactData.rowList = rowList;
       return $xeList.$nextTick();
     },
     updateYData: function updateYData() {
@@ -22393,6 +22524,12 @@ function list_createInternalData() {
         checked: isChecked
       }, evnt);
     },
+    handleRowDragEndClearStatus: function handleRowDragEndClearStatus() {
+      var $xeList = this;
+      $xeList.clearRowDragData();
+      $xeList.clearCrossListDragStatus();
+      $xeList.recalculate();
+    },
     clearRowDropOrigin: function clearRowDropOrigin() {
       var $xeList = this;
       var el = $xeList.$refs.refElem;
@@ -22450,7 +22587,7 @@ function list_createInternalData() {
     clearCrossListDragStatus: function clearCrossListDragStatus() {
       var $xeList = this;
       var crossListDragRowInfo = getCrossListDragRowInfo($xeList);
-      // crossListDragRowObj = null
+      crossListDragRowObj = null;
       crossListDragRowInfo.row = null;
     },
     clearDragStatus: function clearDragStatus() {
@@ -22467,10 +22604,12 @@ function list_createInternalData() {
     handleRowDragMousedownEvent: function handleRowDragMousedownEvent(evnt, params) {
       var $xeList = this;
       var reactData = $xeList.reactData;
+      var crossListDragRowInfo = getCrossListDragRowInfo($xeList);
       evnt.stopPropagation();
       var row = params.row;
       var dragConfig = $xeList.computeDragOpts;
-      var trigger = dragConfig.trigger,
+      var isCrossListDrag = dragConfig.isCrossListDrag,
+        trigger = dragConfig.trigger,
         dragStartMethod = dragConfig.dragStartMethod;
       var dragEl = evnt.currentTarget;
       var rowEl = trigger === 'row' ? dragEl : dragEl.parentElement.parentElement;
@@ -22481,6 +22620,13 @@ function list_createInternalData() {
         $xeList.hideDropTip();
         return;
       }
+      if (isCrossListDrag) {
+        crossListDragRowInfo.row = row;
+        crossListDragRowObj = {
+          $oldList: $xeList,
+          $newList: null
+        };
+      }
       var dragstartEventParams = {
         row: row
       };
@@ -22695,6 +22841,17 @@ function list_createInternalData() {
       var dragRow = reactData.dragRow;
       var prevDragRow = internalData.prevDragRow,
         prevDragPos = internalData.prevDragPos;
+      var dragConfig = $xeList.computeDragOpts;
+      var isCrossListDrag = dragConfig.isCrossListDrag;
+      // 跨列表拖拽
+      if (isCrossListDrag && crossListDragRowObj) {
+        var _crossListDragRowObj = crossListDragRowObj,
+          $newList = _crossListDragRowObj.$newList;
+        if ($newList && $newList.xID !== $xeList.xID) {
+          $newList.handleCrossListRowDragInsertEvent(evnt);
+          return;
+        }
+      }
       $xeList.handleRowDragSwapEvent(evnt, dragRow, prevDragRow, prevDragPos);
     },
     handleRowDragDragoverEvent: function handleRowDragDragoverEvent(evnt) {
@@ -22793,6 +22950,477 @@ function list_createInternalData() {
         row: row
       }, evnt);
     },
+    insertListRow: function insertListRow(newRecords, isAppend) {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var fullData = internalData.fullData,
+        rowMaps = internalData.rowMaps;
+      var keyField = $xeList.computeKeyField;
+      var funcName = isAppend ? 'push' : 'unshift';
+      newRecords.forEach(function (item) {
+        var rowid = getRowIdByField(item, keyField);
+        var rowRest = getItemCacheObj(item);
+        fullData[funcName](item);
+        rowMaps[rowid] = rowRest;
+      });
+    },
+    handleInsertRowAt: function handleInsertRowAt(records, targetRowOrRowKey, isInsertNextRow) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var fullData = internalData.fullData,
+        rowMaps = internalData.rowMaps,
+        removeRowMaps = internalData.removeRowMaps,
+        insertRowMaps = internalData.insertRowMaps;
+      var keyField = $xeList.computeKeyField;
+      if (!keyField) {
+        list_errLog('vxe.error.reqSupportProp', ['insert() | insertAt() | insertNextAt()', 'row-config.keyField']);
+        return Promise.resolve({
+          row: null,
+          rows: []
+        });
+      }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
+        records = [records];
+      }
+      var targetRow = targetRowOrRowKey;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(targetRowOrRowKey) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowOrRowKey)) {
+        var rowRest = rowMaps[targetRowOrRowKey];
+        if (rowRest) {
+          targetRow = rowRest.item;
+        }
+      }
+      if (!records.length) {
+        return Promise.resolve({
+          row: null,
+          rows: []
+        });
+      }
+      var newRecords = records.map(function (record) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign({}, record);
+      });
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(targetRow)) {
+        $xeList.insertListRow(newRecords, false);
+      } else {
+        if (targetRow === -1) {
+          $xeList.insertListRow(newRecords, true);
+        } else {
+          var rowIndex = fullData.findIndex(function (item) {
+            return targetRow[keyField] === item[keyField];
+          });
+          if (rowIndex > -1) {
+            newRecords.forEach(function (item) {
+              var rowid = getRowIdByField(item, keyField);
+              var rowRest = getItemCacheObj(item);
+              rowMaps[rowid] = rowRest;
+            });
+            var targetIndex = rowIndex;
+            if (isInsertNextRow) {
+              targetIndex = targetIndex + 1;
+            }
+            fullData.splice.apply(fullData, [targetIndex, 0].concat(_toConsumableArray(newRecords)));
+          } else {
+            list_warnLog('vxe.error.unableInsert');
+            $xeList.insertListRow(newRecords, true);
+          }
+        }
+      }
+      newRecords.forEach(function (newItem) {
+        var rowid = getRowIdByField(newItem, keyField);
+        // 如果是被删除的数据，则还原状态
+        if (removeRowMaps[rowid]) {
+          delete removeRowMaps[rowid];
+          if (insertRowMaps[rowid]) {
+            delete insertRowMaps[rowid];
+          }
+        } else {
+          insertRowMaps[rowid] = newItem;
+        }
+      });
+      reactData.removeRowFlag++;
+      reactData.insertRowFlag++;
+      $xeList.cacheRowMap();
+      $xeList.handleData(true);
+      $xeList.updateAfterDataIndex();
+      $xeList.updateCheckboxStatus();
+      if (reactData.scrollYLoad) {
+        $xeList.updateYSpace();
+      }
+      return $xeList.$nextTick().then(function () {
+        return {
+          row: newRecords.length ? newRecords[newRecords.length - 1] : null,
+          rows: newRecords
+        };
+      });
+    },
+    insert: function insert(records) {
+      var $xeList = this;
+      return $xeList.handleInsertRowAt(records, null);
+    },
+    insertAt: function insertAt(records, targetRowOrRowKey) {
+      var $xeList = this;
+      return $xeList.handleInsertRowAt(records, targetRowOrRowKey);
+    },
+    insertNextAt: function insertNextAt(records, targetRowOrRowKey) {
+      var $xeList = this;
+      return $xeList.handleInsertRowAt(records, targetRowOrRowKey, true);
+    },
+    getInsertRecords: function getInsertRecords() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var insertRowMaps = internalData.insertRowMaps;
+      var insertRecords = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(insertRowMaps, function (item) {
+        insertRecords.push(item);
+      });
+      return insertRecords;
+    },
+    isInsertByRow: function isInsertByRow(row) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var rowid = $xeList.getRowId(row);
+      return !!reactData.insertRowFlag && !!internalData.insertRowMaps[rowid];
+    },
+    remove: function remove(rows) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var fullData = internalData.fullData,
+        insertRowMaps = internalData.insertRowMaps,
+        removeRowMaps = internalData.removeRowMaps;
+      var keyField = $xeList.computeKeyField;
+      if (!keyField) {
+        list_errLog('vxe.error.reqSupportProp', ['insert() | insertAt() | insertNextAt()', 'row-config.keyField']);
+        return Promise.resolve({
+          row: null,
+          rows: []
+        });
+      }
+      var delList = [];
+      if (!rows) {
+        rows = fullData;
+      } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+        rows = [rows];
+      }
+      if (!rows.length) {
+        return Promise.resolve({
+          row: null,
+          rows: []
+        });
+      }
+      // 如果是新增，则保存记录
+      rows.forEach(function (item) {
+        if (!$xeList.isInsertByRow(item)) {
+          var rowid = $xeList.getRowId(item);
+          removeRowMaps[rowid] = item;
+        }
+      });
+      // 从数据源中移除
+      if (fullData === rows) {
+        rows = delList = fullData.slice(0);
+        internalData.fullData = [];
+      } else {
+        rows.forEach(function (item) {
+          var rowid = $xeList.getRowId(item);
+          var rowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(fullData, function (item) {
+            return rowid === $xeList.getRowId(item);
+          });
+          if (rowIndex > -1) {
+            var rItems = fullData.splice(rowIndex, 1);
+            delList.push(rItems[0]);
+          }
+        });
+      }
+      // 从新增中移除已删除的数据
+      rows.forEach(function (item) {
+        var rowid = $xeList.getRowId(item);
+        if (insertRowMaps[rowid]) {
+          delete insertRowMaps[rowid];
+        }
+      });
+      reactData.removeRowFlag++;
+      reactData.insertRowFlag++;
+      $xeList.cacheRowMap();
+      $xeList.handleData(true);
+      $xeList.updateAfterDataIndex();
+      $xeList.updateCheckboxStatus();
+      if (reactData.scrollYLoad) {
+        $xeList.updateYSpace();
+      }
+      return $xeList.$nextTick().then(function () {
+        return $xeList.recalculate();
+      }).then(function () {
+        return {
+          row: delList.length ? delList[delList.length - 1] : null,
+          rows: delList
+        };
+      });
+    },
+    getRemoveRecords: function getRemoveRecords() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var removeRowMaps = internalData.removeRowMaps;
+      var removeRecords = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(removeRowMaps, function (item) {
+        removeRecords.push(item);
+      });
+      return removeRecords;
+    },
+    isRemoveByRow: function isRemoveByRow(row) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var rowid = $xeList.getRowId(row);
+      return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid];
+    },
+    handleCrossListRowDragCancelEvent: function handleCrossListRowDragCancelEvent() {
+      var $xeList = this;
+      $xeList.clearRowDragData();
+      $xeList.clearCrossListDragStatus();
+    },
+    /**
+       * 处理跨树拖拽完成
+       */
+    handleCrossListRowDragFinishEvent: function handleCrossListRowDragFinishEvent(evnt) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var crossListDragRowInfo = getCrossListDragRowInfo($xeList);
+      var rowList = reactData.rowList;
+      var rowMaps = internalData.rowMaps;
+      var dragOpts = $xeList.computeDragOpts;
+      var animation = dragOpts.animation,
+        isCrossListDrag = dragOpts.isCrossListDrag;
+      var el = $xeList.$refs.refElem;
+      if (!el) {
+        return;
+      }
+      if (isCrossListDrag && crossListDragRowObj && crossListDragRowInfo) {
+        var dragRow = crossListDragRowInfo.row;
+        if (dragRow) {
+          var dragRowid = $xeList.getRowId(dragRow);
+          var dragRowRest = rowMaps[dragRowid];
+          var dragRowHeight = 0;
+          var rsIndex = -1;
+          if (dragRowRest) {
+            if (animation) {
+              var oldItemEl = el.querySelector(".vxe-list--row[rowid=\"".concat(dragRowid, "\"]"));
+              var targetItemEl = oldItemEl;
+              if (targetItemEl) {
+                dragRowHeight = targetItemEl.offsetHeight;
+              }
+            }
+            rsIndex = dragRowRest.$index;
+          }
+          var dragRangeList = rsIndex > -1 && rsIndex < rowList.length - 1 ? rowList.slice(rsIndex + 1) : [];
+          var dragList = [dragRow];
+          $xeList.remove(dragList).then(function () {
+            if (animation && dragRowHeight && dragRangeList.length) {
+              var wrapperEl = el;
+              var dtClss = [];
+              dragRangeList.forEach(function (item) {
+                var rowid = $xeList.getRowId(item);
+                dtClss.push(".vxe-list--row[rowid=\"".concat(rowid, "\"]"));
+              });
+              var dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+              moveRowAnimateToTb(dtTrList, dragRowHeight);
+            }
+          });
+          $xeList.dispatchEvent('row-remove-dragend', {
+            row: dragRow
+          }, evnt);
+          $xeList.handleRowDragEndClearStatus();
+        }
+      }
+    },
+    /**
+       * 处理跨树拖至新的空树
+       */
+    handleCrossListRowDragoverEmptyEvent: function handleCrossListRowDragoverEmptyEvent(evnt) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var rowList = reactData.rowList;
+      var dragOpts = $xeList.computeDragOpts;
+      var isCrossListDrag = dragOpts.isCrossListDrag;
+      if (isCrossListDrag && crossListDragRowObj && !rowList.length) {
+        var _crossListDragRowObj2 = crossListDragRowObj,
+          $oldList = _crossListDragRowObj2.$oldList,
+          $newList = _crossListDragRowObj2.$newList;
+        if ($oldList) {
+          var oldListReactData = $oldList;
+          if ($oldList.xID !== $xeList.xID) {
+            if ($newList && $newList.xID !== $xeList.xID) {
+              $newList.hideCrossListRowDropClearStatus();
+            }
+            evnt.preventDefault();
+            $oldList.hideCrossListRowDropClearStatus();
+            crossListDragRowObj.$newList = $xeList;
+            internalData.prevDragRow = null;
+            reactData.dragTipText = oldListReactData.dragTipText;
+            $xeList.showDropTip(evnt, evnt.currentTarget, true, '');
+          }
+        }
+      }
+    },
+    /**
+       * 处理跨树拖插入
+       */
+    handleCrossListRowDragInsertEvent: function handleCrossListRowDragInsertEvent(evnt) {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var crossListDragRowInfo = getCrossListDragRowInfo($xeList);
+      var prevDragRow = internalData.prevDragRow,
+        prevDragPos = internalData.prevDragPos;
+      var dragOpts = $xeList.computeDragOpts;
+      var animation = dragOpts.animation,
+        isCrossListDrag = dragOpts.isCrossListDrag,
+        dragEndMethod = dragOpts.dragEndMethod;
+      // 跨表拖拽
+      if (isCrossListDrag && crossListDragRowObj && crossListDragRowInfo) {
+        var oldRow = crossListDragRowInfo.row;
+        var _crossListDragRowObj3 = crossListDragRowObj,
+          $oldList = _crossListDragRowObj3.$oldList;
+        var el = $xeList.$refs.refElem;
+        if (!el) {
+          return;
+        }
+        if ($oldList && oldRow) {
+          var dragRow = oldRow;
+          var dragOffsetIndex = -1;
+          if (prevDragRow) {
+            dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+          }
+          var dragParams = {
+            oldRow: dragRow,
+            newRow: prevDragRow,
+            dragRow: dragRow,
+            dragPos: prevDragPos,
+            offsetIndex: dragOffsetIndex
+          };
+          var errRest = {
+            status: false
+          };
+          Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(function (status) {
+            if (!status) {
+              if ($oldList) {
+                if ($oldList.xID !== $xeList.xID) {
+                  $oldList.handleCrossListRowDragCancelEvent(evnt);
+                }
+              }
+              $xeList.handleRowDragEndClearStatus();
+              return errRest;
+            }
+            var insertRest = Promise.resolve();
+            var dragList = [dragRow];
+            $oldList.handleCrossListRowDragFinishEvent(evnt);
+            if (prevDragRow) {
+              if (prevDragPos === 'bottom') {
+                insertRest = $xeList.insertNextAt(dragList, prevDragRow);
+              } else {
+                insertRest = $xeList.insertAt(dragList, prevDragRow);
+              }
+            } else {
+              insertRest = $xeList.insert(dragList);
+            }
+            $xeList.dispatchEvent('row-insert-dragend', {
+              oldRow: oldRow,
+              newRow: prevDragRow,
+              dragRow: dragRow,
+              dragPos: prevDragPos,
+              offsetIndex: dragOffsetIndex
+            }, evnt);
+            $xeList.clearRowDragData();
+            insertRest.then(function () {
+              var rowList = reactData.rowList;
+              var rowMaps = internalData.rowMaps;
+              var oldRowid = $xeList.getRowId(dragRow);
+              var oldRowRest = rowMaps[oldRowid];
+              var dragRowHeight = 0;
+              var rsIndex = -1;
+              if (oldRowRest) {
+                if (animation) {
+                  var oldItemEl = el.querySelector(".vxe-list--row[rowid=\"".concat(oldRowid, "\"]"));
+                  var targetItemEl = oldItemEl;
+                  if (targetItemEl) {
+                    dragRowHeight = targetItemEl.offsetHeight;
+                  }
+                }
+                rsIndex = oldRowRest.$index;
+              }
+              var dragRangeList = rsIndex > -1 ? rowList.slice(rsIndex) : [];
+              if (animation && dragRowHeight && dragRangeList.length) {
+                var wrapperEl = el;
+                var dtClss = [];
+                dragRangeList.forEach(function (item) {
+                  var rowid = $xeList.getRowId(item);
+                  dtClss.push(".vxe-list--row[rowid=\"".concat(rowid, "\"]"));
+                });
+                var dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+                moveRowAnimateToTb(dtTrList, -dragRowHeight);
+              }
+            });
+          });
+        }
+      }
+    },
+    hideCrossListRowDropClearStatus: function hideCrossListRowDropClearStatus() {
+      var $xeList = this;
+      $xeList.hideDropTip();
+    },
+    handleContextmenuEvent: function handleContextmenuEvent(evnt, row) {
+      var $xeList = this;
+      var props = $xeList;
+      var reactData = $xeList.reactData;
+      var internalData = $xeList.internalData;
+      var menuConfig = props.menuConfig;
+      var menuOpts = $xeList.computeMenuOpts;
+      var rowOpts = $xeList.computeRowOpts;
+      var isCurrent = rowOpts.isCurrent;
+      if (menuConfig ? isEnableConf(menuOpts) : menuOpts.enabled) {
+        var options = menuOpts.options,
+          visibleMethod = menuOpts.visibleMethod;
+        if (!visibleMethod || visibleMethod({
+          $list: $xeList,
+          options: options,
+          row: row
+        })) {
+          if (isCurrent) {
+            $xeList.changeCurrentEvent(evnt, row);
+          } else if (internalData.currentRow) {
+            internalData.currentRow = null;
+            reactData.currRowFlag++;
+          }
+          if (VxeUI.contextMenu) {
+            VxeUI.contextMenu.openByEvent(evnt, {
+              options: options,
+              events: {
+                optionClick: function optionClick(eventParams) {
+                  var option = eventParams.option;
+                  var gMenuOpts = menus.get(option.code);
+                  var tmMethod = gMenuOpts ? gMenuOpts.listMenuMethod : null;
+                  var params = {
+                    menu: option,
+                    row: row,
+                    $event: evnt,
+                    $list: $xeList
+                  };
+                  if (tmMethod) {
+                    tmMethod(params, evnt);
+                  }
+                  $xeList.dispatchEvent('menu-click', params, eventParams.$event);
+                }
+              }
+            });
+          }
+        }
+      }
+      $xeList.dispatchEvent('row-menu', {
+        row: row
+      }, evnt);
+    },
     //
     // Render
     //
@@ -22915,6 +23543,7 @@ function list_createInternalData() {
       var selectCheckboxMaps = internalData.selectCheckboxMaps,
         currentRow = internalData.currentRow;
       var contentSlot = slots.content;
+      var extraSlot = slots.extra;
       var dragOpts = $xeList.computeDragOpts;
       var trigger = dragOpts.trigger,
         icon = dragOpts.icon,
@@ -22976,6 +23605,12 @@ function list_createInternalData() {
         key: 'ct5',
         class: 'vxe-list--row-content'
       }, contentSlot ? contentSlot(rowParams) : contentField ? getText(row[contentField]) : ''));
+      if (extraSlot) {
+        ctVNs.push(h('div', {
+          key: 'ct7',
+          class: 'vxe-list--row-extra'
+        }, extraSlot(rowParams)));
+      }
       var rowOns = {
         mousedown: function mousedown(evnt) {
           $xeList.handleRowMousedownEvent(evnt, row);
@@ -22986,6 +23621,9 @@ function list_createInternalData() {
         },
         dblclick: function dblclick(evnt) {
           $xeList.handleRowDblclickEvent(evnt, row);
+        },
+        contextmenu: function contextmenu(evnt) {
+          $xeList.handleContextmenuEvent(evnt, row);
         }
       };
       // 拖拽行事件
@@ -23030,16 +23668,22 @@ function list_createInternalData() {
       var radioOpts = $xeList.computeRadioOpts;
       var checkboxOpts = $xeList.computeCheckboxOpts;
       var dragOpts = $xeList.computeDragOpts;
-      var trigger = dragOpts.trigger;
+      var trigger = dragOpts.trigger,
+        isCrossListDrag = dragOpts.isCrossListDrag;
       var rowOpts = $xeList.computeRowOpts;
       var isHover = rowOpts.isHover,
         padding = rowOpts.padding;
       var showDefChekboxHead = showCheckbox && checkboxOpts.showHeader !== false;
+      var leOns = {};
+      if (isCrossListDrag && !rowList.length) {
+        leOns.dragover = $xeList.handleCrossListRowDragoverEmptyEvent;
+      }
       return h('div', {
         ref: 'refElem',
         class: ['vxe-list', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $list: $xeList
         }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading)],
+        on: leOns,
         style: wrapperStyles
       }, [headerSlot || showDefChekboxHead ? h('div', {
         ref: 'refHeaderElem',
@@ -23160,13 +23804,17 @@ function list_createInternalData() {
     var $xeList = this;
     var props = $xeList;
     var internalData = $xeList.internalData;
-    var showRadio = props.showRadio,
+    var showSeq = props.showSeq,
+      showRadio = props.showRadio,
       showCheckbox = props.showCheckbox;
     var rowOpts = $xeList.computeRowOpts;
     var useKey = rowOpts.useKey,
       keyField = rowOpts.keyField;
     var isDrag = $xeList.computeIsDrag;
     if (!keyField) {
+      if (showSeq) {
+        list_errLog('vxe.error.reqSupportProp', ['show-seq', 'row-config.keyField']);
+      }
       if (showRadio) {
         list_errLog('vxe.error.reqSupportProp', ['show-radio', 'row-config.keyField']);
       }
@@ -33986,6 +34634,9 @@ var es_array_sort = __webpack_require__(6910);
 
 
 
+
+var date_panel_createComponentLog = createComponentLog('date-panel'),
+  date_panel_errLog = date_panel_createComponentLog.errLog;
 /* harmony default export */ var date_panel = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeDatePanel',
   mixins: [globalMixins.sizeMixin],
@@ -33994,7 +34645,7 @@ var es_array_sort = __webpack_require__(6910);
     event: 'modelValue'
   },
   props: {
-    value: [String, Number, Date],
+    value: [String, Number, Date, Array],
     type: {
       type: String,
       default: 'date'
@@ -34079,9 +34730,9 @@ var es_array_sort = __webpack_require__(6910);
       currentDate: null
     };
     var internalData = {
-      yearSize: 12,
-      monthSize: 20,
-      quarterSize: 8,
+      yearSize: 16,
+      monthSize: 12,
+      quarterSize: 4,
       hpTimeout: undefined
     };
     return {
@@ -34091,17 +34742,24 @@ var es_array_sort = __webpack_require__(6910);
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
-    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;
@@ -34117,19 +34775,25 @@ var es_array_sort = __webpack_require__(6910);
       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 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(modelValue).split(',').map(function (item) {
-          var date = $xeDatePanel.parseDate(item, dateValueFormat);
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isValidDate(date)) {
-            return date;
+      var restList = [];
+      if (modelValue && isDatePanelType) {
+        (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue) ? modelValue : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(modelValue).split(',')).forEach(function (val) {
+          var strVal = val;
+          if (val) {
+            if (valueFormat === 'timestamp') {
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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;
@@ -34227,8 +34891,8 @@ var es_array_sort = __webpack_require__(6910);
     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;
@@ -34252,7 +34916,7 @@ var es_array_sort = __webpack_require__(6910);
         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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(startYearDate, index, 'first');
           var itemFullYear = date.getFullYear();
           years.push({
@@ -34364,7 +35028,7 @@ var es_array_sort = __webpack_require__(6910);
         var currQuarter = getDateQuarter(currentDate);
         var firstYear = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(firstYear, index);
           var itemFullYear = date.getFullYear();
           var itemQuarter = getDateQuarter(date);
@@ -34398,7 +35062,7 @@ var es_array_sort = __webpack_require__(6910);
         var currFullYear = currentDate.getFullYear();
         var currMonth = currentDate.getMonth();
         var selFullYear = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(selectMonth, 0, 'first').getFullYear();
-        for (var index = -4; index < monthSize - 4; index++) {
+        for (var index = 0; index < monthSize; index++) {
           var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(selectMonth, 0, index);
           var itemFullYear = date.getFullYear();
           var itemMonth = date.getMonth();
@@ -34484,8 +35148,8 @@ var es_array_sort = __webpack_require__(6910);
       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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(item) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
@@ -34529,8 +35193,8 @@ var es_array_sort = __webpack_require__(6910);
       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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(item) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
@@ -34588,8 +35252,8 @@ var es_array_sort = __webpack_require__(6910);
       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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(item) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
@@ -34668,7 +35332,7 @@ var es_array_sort = __webpack_require__(6910);
       var type = props.type,
         multiple = props.multiple;
       if (type === 'time') {
-        return toStringTimeDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(value) ? value : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(value));
+        return toStringTimeDate(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(value) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(value) : 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(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(value), format);
@@ -34863,13 +35527,14 @@ var es_array_sort = __webpack_require__(6910);
         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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.selectDay);
         date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(date, 0, sWeek, firstDayOfWeek);
-      } else if (isDateTimeType) {
+      } else if (isTimeOrDateTimeType) {
         if (datetimePanelValue) {
           date.setHours(datetimePanelValue.getHours());
           date.setMinutes(datetimePanelValue.getMinutes());
@@ -34880,10 +35545,10 @@ var es_array_sort = __webpack_require__(6910);
         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 = [];
@@ -35303,17 +35968,19 @@ var es_array_sort = __webpack_require__(6910);
       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());
@@ -35370,7 +36037,7 @@ var es_array_sort = __webpack_require__(6910);
       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;
@@ -35394,7 +36061,7 @@ var es_array_sort = __webpack_require__(6910);
           $xeDatePanel.dateNowHandle();
         }
       }
-      if (isDateTimeType) {
+      if (isTimeOrDateTimeType) {
         var dtPanelValue = reactData.datePanelValue;
         if (!dtPanelValue) {
           dtPanelValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
@@ -36064,6 +36731,12 @@ var es_array_sort = __webpack_require__(6910);
   },
   created: function created() {
     var $xeDatePanel = this;
+    var props = $xeDatePanel;
+    var type = props.type,
+      multiple = props.multiple;
+    if (multiple && type === 'time') {
+      date_panel_errLog('vxe.error.notSupportProp', ["type=".concat(type), 'multiple=true', 'multiple=false']);
+    }
     $xeDatePanel.initValue();
     $xeDatePanel.dateOpenPanel();
   },
@@ -36376,17 +37049,24 @@ function date_picker_createInternalData() {
       }
       return disabled;
     },
-    computeIsDateTimeType: function computeIsDateTimeType() {
+    computeIsTimeType: function computeIsTimeType() {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
       var type = props.type;
-      return type === 'time' || type === 'datetime';
+      return type === 'time';
+    },
+    computeIsTimeOrDateTimeType: function computeIsTimeOrDateTimeType() {
+      var $xeDatePicker = this;
+      var props = $xeDatePicker;
+      var type = props.type;
+      var isTimeType = $xeDatePicker.computeIsTimeType;
+      return isTimeType || type === 'datetime';
     },
     computeIsDatePickerType: function computeIsDatePickerType() {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
-      var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
-      return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+      var isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
+      return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
     },
     computeIsClearable: function computeIsClearable() {
       var $xeDatePicker = this;
@@ -36396,8 +37076,8 @@ function date_picker_createInternalData() {
     computeIsDatePanelType: function computeIsDatePanelType() {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
-      var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
-      return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+      var isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
+      return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
     },
     computeDateListValue: function computeDateListValue() {
       var $xeDatePicker = this;
@@ -36714,7 +37394,7 @@ function date_picker_createInternalData() {
       var props = $xeDatePicker;
       var modelValue = props.value,
         multiple = props.multiple;
-      var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+      var isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
       var dateValueFormat = $xeDatePicker.computeDateValueFormat;
       var firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek;
       if (props.type === 'week') {
@@ -36727,7 +37407,7 @@ function date_picker_createInternalData() {
       if (multiple) {
         var overCount = $xeDatePicker.computeOverCount;
         // 如果为多选
-        if (isDateTimeType) {
+        if (isTimeOrDateTimeType) {
           // 如果是datetime特殊类型
           var dateListValue = isReload ? [] : _toConsumableArray($xeDatePicker.computeDateListValue);
           var datetimeRest = [];
@@ -37360,9 +38040,9 @@ function date_picker_createInternalData() {
         autoClose = props.autoClose;
       var value = params.value,
         $event = params.$event;
-      var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+      var isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
       $xeDatePicker.handleChange(value, $event);
-      if (!multiple && !isDateTimeType) {
+      if (!multiple && !isTimeOrDateTimeType) {
         if (autoClose) {
           $xeDatePicker.hidePanel();
         }
@@ -37698,7 +38378,7 @@ function date_picker_createInternalData() {
       var btnTransfer = $xeDatePicker.computeBtnTransfer;
       var shortcutOpts = $xeDatePicker.computeShortcutOpts;
       var isClearable = $xeDatePicker.computeIsClearable;
-      var isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+      var isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
       var shortcutList = $xeDatePicker.computeShortcutList;
       var timeOpts = $xeDatePicker.computeTimeOpts;
       var dateStartDate = $xeDatePicker.computeDateStartDate;
@@ -37712,7 +38392,7 @@ function date_picker_createInternalData() {
       var rightSlot = slots.right;
       var ppClassName = popupOpts.className;
       var hasShortcutBtn = shortcutList.length > 0;
-      var showConfirmBtn = showConfirmButton === null ? isDateTimeType || multiple : showConfirmButton;
+      var showConfirmBtn = showConfirmButton === null ? isTimeOrDateTimeType || multiple : showConfirmButton;
       var showClearBtn = showClearButton === null ? isClearable && showConfirmBtn && type !== 'time' : showClearButton;
       return h('div', {
         ref: 'refInputPanel',
@@ -38008,6 +38688,9 @@ var DatePicker = VxeDatePicker;
 
 
 
+
+
+
 
 
 
@@ -38025,8 +38708,8 @@ function date_range_picker_createReactData() {
     isActivated: false,
     selectStValue: '',
     selectEdValue: '',
-    paneStartVal: '',
-    paneEndVal: ''
+    paneStartVal: [],
+    paneEndVal: []
   };
 }
 function date_range_picker_createInternalData() {
@@ -38288,11 +38971,18 @@ function date_range_picker_createInternalData() {
         endValue = props.endValue;
       return "".concat(startValue || '').concat(endValue || '');
     },
-    computeIsDateTimeType: function computeIsDateTimeType() {
+    computeIsTimeType: function computeIsTimeType() {
       var $xeDateRangePicker = this;
       var props = $xeDateRangePicker;
       var type = props.type;
-      return type === 'time' || type === 'datetime';
+      return type === 'time';
+    },
+    computeIsTimeOrDateTimeType: function computeIsTimeOrDateTimeType() {
+      var $xeDateRangePicker = this;
+      var props = $xeDateRangePicker;
+      var type = props.type;
+      var isTimeType = $xeDateRangePicker.computeIsTimeType;
+      return isTimeType || type === 'datetime';
     },
     computeIsDatePickerType: function computeIsDatePickerType() {
       var $xeDateRangePicker = this;
@@ -38512,7 +39202,8 @@ function date_range_picker_createInternalData() {
       var reactData = $xeDateRangePicker.reactData;
       var modelValue = props.value,
         startValue = props.startValue,
-        endValue = props.endValue;
+        endValue = props.endValue,
+        valueFormat = props.valueFormat;
       var restObj = {
         sValue: '',
         eValue: ''
@@ -38530,8 +39221,20 @@ function date_range_picker_createInternalData() {
           restObj = $xeDateRangePicker.paraeUpdateModel();
         }
       }
-      reactData.selectStValue = restObj.sValue;
-      reactData.selectEdValue = restObj.eValue;
+      var startRest = restObj.sValue;
+      var endRest = restObj.eValue;
+      if (valueFormat === 'timestamp') {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(startRest) && /^\d+$/.test(startRest)) {
+          startRest = Number(startRest);
+        }
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(endRest) && /^\d+$/.test(endRest)) {
+          endRest = Number(endRest);
+        }
+      }
+      reactData.selectStValue = startRest;
+      reactData.selectEdValue = endRest;
+      reactData.paneEndVal = [startRest, endRest];
+      reactData.paneStartVal = [startRest, endRest];
     },
     triggerEvent: function triggerEvent(evnt) {
       var $xeDateRangePicker = this;
@@ -38766,12 +39469,16 @@ function date_range_picker_createInternalData() {
     },
     confirmEvent: function confirmEvent(evnt) {
       var $xeDateRangePicker = this;
+      var isTimeType = $xeDateRangePicker.computeIsTimeType;
       var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
       var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
       if ($startDatePanel && $endDatePanel) {
         var startValue = $startDatePanel.getModelValue();
         var endValue = $endDatePanel.getModelValue();
-        if (startValue && !endValue || !startValue && endValue) {
+        if (isTimeType) {
+          $startDatePanel.confirmByEvent(evnt);
+          $endDatePanel.confirmByEvent(evnt);
+        } else if (startValue && !endValue || !startValue && endValue) {
           $xeDateRangePicker.handleChange('', '', evnt);
         } else {
           $startDatePanel.confirmByEvent(evnt);
@@ -38807,11 +39514,15 @@ function date_range_picker_createInternalData() {
       } else {
         startValue = currValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(paneVals);
       }
-      reactData.paneEndVal = [startValue, endValue].join(',');
-      reactData.paneStartVal = [startValue, endValue].join(',');
+      reactData.paneEndVal = [startValue, endValue];
+      reactData.paneStartVal = [startValue, endValue];
       $xeDateRangePicker.handleChange(startValue, endValue, $event);
       $xeDateRangePicker.handleSelectClose();
-      if (!selectStatus) {
+      if (selectStatus) {
+        if (startValue && endValue) {
+          internalData.selectStatus = false;
+        }
+      } else {
         internalData.selectStatus = true;
       }
       $xeDateRangePicker.$nextTick(function () {
@@ -38840,11 +39551,15 @@ function date_range_picker_createInternalData() {
       } else {
         endValue = currValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(paneVals);
       }
-      reactData.paneEndVal = [startValue, endValue].join(',');
-      reactData.paneStartVal = [startValue, endValue].join(',');
+      reactData.paneEndVal = [startValue, endValue];
+      reactData.paneStartVal = [startValue, endValue];
       $xeDateRangePicker.handleChange(startValue, endValue, $event);
       $xeDateRangePicker.handleSelectClose();
-      if (!selectStatus) {
+      if (selectStatus) {
+        if (startValue && endValue) {
+          internalData.selectStatus = false;
+        }
+      } else {
         internalData.selectStatus = true;
       }
       $xeDateRangePicker.$nextTick(function () {
@@ -38878,6 +39593,24 @@ function date_range_picker_createInternalData() {
             }
             break;
           }
+        case 'month':
+        case 'quarter':
+          {
+            if (endYear <= startYear) {
+              $endDatePanel.setPanelDate(getNextYear(startPanelDate));
+            }
+            break;
+          }
+        case 'year':
+          {
+            var yearList = $startDatePanel.computeYearList;
+            if (yearList.some(function (item) {
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(item.date, endPanelDate, 'yyyy');
+            })) {
+              $endDatePanel.setPanelDate(getNextYear(startPanelDate, yearList.length));
+            }
+            break;
+          }
       }
     },
     startPanelDateBtnChangeEvent: function startPanelDateBtnChangeEvent() {
@@ -38904,6 +39637,18 @@ function date_range_picker_createInternalData() {
               $endDatePanel.setPanelDate(getNextMonth(startPanelDate));
               break;
             }
+          case 'month':
+          case 'quarter':
+            {
+              $endDatePanel.setPanelDate(getNextYear(startPanelDate));
+              break;
+            }
+          case 'year':
+            {
+              var yearList = $startDatePanel.computeYearList;
+              $endDatePanel.setPanelDate(getNextYear(startPanelDate, yearList.length));
+              break;
+            }
         }
       } else {
         $xeDateRangePicker.handleUpdateStartPanelDate();
@@ -38936,6 +39681,24 @@ function date_range_picker_createInternalData() {
             }
             break;
           }
+        case 'month':
+        case 'quarter':
+          {
+            if (startYear >= endYear) {
+              $startDatePanel.setPanelDate(getPrevYear(endPanelDate));
+            }
+            break;
+          }
+        case 'year':
+          {
+            var yearList = $endDatePanel.computeYearList;
+            if (yearList.some(function (item) {
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(item.date, startPanelDate, 'yyyy');
+            })) {
+              $startDatePanel.setPanelDate(getPrevYear(endPanelDate, yearList.length));
+            }
+            break;
+          }
       }
     },
     endPanelDateBtnChangeEvent: function endPanelDateBtnChangeEvent() {
@@ -38962,6 +39725,18 @@ function date_range_picker_createInternalData() {
               $startDatePanel.setPanelDate(getPrevMonth(endPanelDate));
               break;
             }
+          case 'month':
+          case 'quarter':
+            {
+              $startDatePanel.setPanelDate(getPrevYear(endPanelDate));
+              break;
+            }
+          case 'year':
+            {
+              var yearList = $endDatePanel.computeYearList;
+              $startDatePanel.setPanelDate(getPrevYear(endPanelDate, yearList.length));
+              break;
+            }
         }
       } else {
         $xeDateRangePicker.handleUpdateEndPanelDate();
@@ -39309,7 +40084,8 @@ function date_range_picker_createInternalData() {
       var isClearable = $xeDateRangePicker.computeIsClearable;
       var panelLabelObj = $xeDateRangePicker.computePanelLabelObj;
       var shortcutList = $xeDateRangePicker.computeShortcutList;
-      var isDateTimeType = $xeDateRangePicker.computeIsDateTimeType;
+      var isTimeType = $xeDateRangePicker.computeIsTimeType;
+      var isTimeOrDateTimeType = $xeDateRangePicker.computeIsTimeOrDateTimeType;
       var defaultDates = $xeDateRangePicker.computeDefaultDates;
       var defaultTimes = $xeDateRangePicker.computeDefaultTimes;
       var timeOpts = $xeDateRangePicker.computeTimeOpts;
@@ -39330,7 +40106,7 @@ function date_range_picker_createInternalData() {
         sdTime = _defaultTimes[0],
         edTime = _defaultTimes[1];
       var hasShortcutBtn = shortcutList.length > 0;
-      var showConfirmBtn = showConfirmButton === null ? isDateTimeType || !autoClose : showConfirmButton;
+      var showConfirmBtn = showConfirmButton === null ? isTimeOrDateTimeType || !autoClose : showConfirmButton;
       var showClearBtn = showClearButton === null ? isClearable : showClearButton;
       return h('div', {
         ref: 'refInputPanel',
@@ -39360,7 +40136,7 @@ function date_range_picker_createInternalData() {
         ref: 'refStartDatePanel',
         props: {
           value: paneStartVal,
-          multiple: true,
+          multiple: !isTimeType,
           valueSort: true,
           limitCount: 3,
           defaultMode: 'first',
@@ -39390,7 +40166,7 @@ function date_range_picker_createInternalData() {
         ref: 'refEndDatePanel',
         props: {
           value: paneEndVal,
-          multiple: true,
+          multiple: !isTimeType,
           valueSort: true,
           limitCount: 3,
           defaultMode: 'last',
@@ -61117,7 +61893,7 @@ function calcTreeLine($xeTree, node, prevNode) {
   }
   return (rowHeight || 28) * expandSize - (prevNode ? 1 : 12);
 }
-function getItemCacheObj(item) {
+function util_getItemCacheObj(item) {
   return {
     item: item,
     index: -1,
@@ -61647,7 +62423,7 @@ function insertTreeNode($xeTree, newRecords, isAppend) {
     }, {
       children: mapChildrenField
     }) : null;
-    var itemRest = getItemCacheObj(item);
+    var itemRest = util_getItemCacheObj(item);
     if (matchObj) {
       var parentItem = matchObj.item;
       var parentRest = nodeMaps[$xeTree.getNodeId(parentItem)];
@@ -62884,7 +63660,7 @@ function tree_createReactData() {
             });
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(treeRecords, function (item) {
               var nodeid = $xeTree.getNodeId(item);
-              var nodeRest = getItemCacheObj(item);
+              var nodeRest = util_getItemCacheObj(item);
               nodeRest.level = parentLevel;
               if (item[childrenField]) {
                 item[mapChildrenField] = item[childrenField];