vxe-table 4.13.21 → 4.13.23

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.21";
+const version = "4.13.23";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.21"}`;
+const log_version = `table v${"4.13.23"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3851,6 +3851,12 @@ function toCssUnit(val, unit = 'px') {
   }
   return `${val || ''}`;
 }
+function queryElement(elem, selector) {
+  if (elem) {
+    return elem.querySelector(selector);
+  }
+  return null;
+}
 function getDomNode() {
   const documentElement = document.documentElement;
   const bodyElem = document.body;
@@ -4138,7 +4144,7 @@ function getPaddingLeftRightSize(elem) {
   }
   return 0;
 }
-function getElementMarginWidth(elem) {
+function getElementMarginAndWidth(elem) {
   if (elem) {
     const computedStyle = getComputedStyle(elem);
     const marginLeft = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(computedStyle.marginLeft);
@@ -4147,9 +4153,6 @@ function getElementMarginWidth(elem) {
   }
   return 0;
 }
-function queryCellElement(cell, selector) {
-  return cell.querySelector('.vxe-cell' + selector);
-}
 function toFilters(filters) {
   if (filters && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(filters)) {
     return filters.map(({
@@ -4262,19 +4265,19 @@ function getColReMinWidth(params) {
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
   const hasEllipsis = showTitle || showTooltip || showEllipsis;
-  const minTitleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor((external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(cell).fontSize) || 14) * 1.6);
-  const paddingLeftRight = getPaddingLeftRightSize(cell) + getPaddingLeftRightSize(queryCellElement(cell, ''));
+  const minTitleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor((external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(cell).fontSize) || 14) * 1.8);
+  const paddingLeftRight = getPaddingLeftRightSize(cell) + getPaddingLeftRightSize(queryElement(cell, '.vxe-cell'));
   let mWidth = minTitleWidth + paddingLeftRight;
   // 默认最小宽处理
   if (hasEllipsis) {
-    const dragIconWidth = getPaddingLeftRightSize(queryCellElement(cell, '>.vxe-cell--drag-handle'));
-    const checkboxIconWidth = getPaddingLeftRightSize(queryCellElement(cell, '>.vxe-cell--checkbox'));
-    const requiredIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--required-icon'));
-    const editIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--edit-icon'));
-    const prefixIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell-title-prefix-icon'));
-    const suffixIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell-title-suffix-icon'));
-    const sortIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--sort'));
-    const filterIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--filter'));
+    const dragIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--drag-handle'));
+    const checkboxIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--checkbox'));
+    const requiredIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--required-icon'));
+    const editIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--edit-icon'));
+    const prefixIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell-title-prefix-icon'));
+    const suffixIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell-title-suffix-icon'));
+    const sortIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--sort'));
+    const filterIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--filter'));
     mWidth += dragIconWidth + checkboxIconWidth + requiredIconWidth + editIconWidth + prefixIconWidth + suffixIconWidth + filterIconWidth + sortIconWidth;
   }
   // 如果设置最小宽
@@ -4676,15 +4679,17 @@ function renderTitlePrefixIcon(params) {
   } = params;
   const titlePrefix = column.titlePrefix || column.titleHelp;
   if (titlePrefix) {
-    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
+    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : ''],
       onMouseenter(evnt) {
         $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
       },
       onMouseleave(evnt) {
         $table.handleTargetLeaveEvent(evnt);
       }
-    });
+    }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      class: titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -4695,15 +4700,17 @@ function renderTitleSuffixIcon(params) {
   } = params;
   const titleSuffix = column.titleSuffix;
   if (titleSuffix) {
-    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
+    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : ''],
       onMouseenter(evnt) {
         $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
       },
       onMouseleave(evnt) {
         $table.handleTargetLeaveEvent(evnt);
       }
-    });
+    }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      class: titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -5988,11 +5995,13 @@ const Cell = {
     }
     let editIconVNs = [];
     if (isEnableConf(editConfig)) {
-      editIconVNs = [isRequired && editOpts.showAsterisk ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      editIconVNs = [isRequired && editOpts.showAsterisk ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-cell--required-icon'
-      }) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-        class: ['vxe-cell--edit-icon', editOpts.icon || cell_getIcon().TABLE_EDIT]
-      }) : renderEmptyElement($table)];
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i')]) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-cell--edit-icon'
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+        class: editOpts.icon || cell_getIcon().TABLE_EDIT
+      })]) : renderEmptyElement($table)];
     }
     return renderHeaderCellBaseVNs(params, editIconVNs.concat(Cell.renderHeaderTitle(params)).concat(sortable ? Cell.renderSortIcon(params) : []).concat(filters ? Cell.renderFilterIcon(params) : []));
   },
@@ -11761,6 +11770,7 @@ const {
           const gCommandOpts = toolbar_commands.get(code);
           const params = {
             code,
+            button: null,
             tool: item,
             $table: $table,
             $grid: $xeGrid,
@@ -12198,7 +12208,7 @@ const {
   renderEmptyElement: grid_renderEmptyElement
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(src_props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
@@ -19449,7 +19459,7 @@ const blurEvent = 'blur';
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, eFns) {
+function getComponentOns(renderOpts, params, eFns, eventOns) {
   const {
     events
   } = renderOpts;
@@ -19493,7 +19503,7 @@ function getComponentOns(renderOpts, params, eFns) {
       }
     };
   }
-  return ons;
+  return eventOns ? Object.assign(ons, eventOns) : ons;
 }
 function getEditOns(renderOpts, params) {
   const {
@@ -20199,6 +20209,89 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleFilterMethod
   },
+  VxeDateRangePicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit(renderOpts, params) {
+      const {
+        startField,
+        endField
+      } = renderOpts;
+      const {
+        $table,
+        row,
+        column
+      } = params;
+      const {
+        model
+      } = column;
+      const cellValue = getCellValue(row, column);
+      const seProps = {};
+      const seOs = {};
+      if (startField && endField) {
+        seProps.startValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, startField);
+        seProps.endValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, endField);
+        seOs['onUpdate:startValue'] = value => {
+          if (startField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, startField, value);
+          }
+        };
+        seOs['onUpdate:endValue'] = value => {
+          if (endField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, endField, value);
+          }
+        };
+      }
+      return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(getDefaultComponent(renderOpts), {
+        ...getCellEditProps(renderOpts, params, cellValue, seProps),
+        ...getComponentOns(renderOpts, params, {
+          model(cellValue) {
+            model.update = true;
+            model.value = cellValue;
+            setCellValue(row, column, cellValue);
+          },
+          change() {
+            $table.updateStatus(params);
+          },
+          blur() {
+            $table.handleCellRuleUpdateStatus('blur', params);
+          }
+        }, seOs)
+      })];
+    },
+    renderTableCell(renderOpts, params) {
+      const {
+        startField,
+        endField
+      } = renderOpts;
+      const {
+        row,
+        column
+      } = params;
+      let startValue = '';
+      let endValue = '';
+      if (startField && endField) {
+        startValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, startField);
+        endValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, endField);
+      } else {
+        const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+        if (cellValue) {
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(cellValue)) {
+            startValue = cellValue[0];
+            endValue = cellValue[1];
+          } else {
+            const strs = `${cellValue}`.split(',');
+            startValue = strs[0];
+            endValue = strs[1];
+          }
+        }
+      }
+      let cellLabel = '';
+      if (startValue && endValue) {
+        cellLabel = `${startValue} ~ ${endValue}`;
+      }
+      return getCellLabelVNs(renderOpts, params, cellLabel);
+    }
+  },
   VxeTextarea: {
     tableAutoFocus: 'textarea',
     renderTableEdit: defaultEditRender,
@@ -20824,6 +20917,9 @@ const Toolbar = VxeToolbar;
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',