vxe-table 3.15.21 → 3.15.23

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.21";
+const version = "3.15.23";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2740,6 +2740,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;
@@ -2858,7 +2864,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.21"}`;
+const log_version = `table v${"3.15.23"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3191,7 +3197,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);
@@ -3279,9 +3285,6 @@ function getRootColumn($xeTable, column) {
   }
   return column;
 }
-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(({
@@ -3336,19 +3339,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, ''));
   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;
   }
   // 如果设置最小宽
@@ -3668,7 +3671,7 @@ function renderTitlePrefixIcon(h, params) {
   const titlePrefix = column.titlePrefix || column.titleHelp;
   if (titlePrefix) {
     return h('i', {
-      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
+      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : ''],
       on: {
         mouseenter(evnt) {
           $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
@@ -3677,7 +3680,9 @@ function renderTitlePrefixIcon(h, params) {
           $table.handleTargetLeaveEvent(evnt);
         }
       }
-    });
+    }, [h('i', {
+      class: titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -3689,7 +3694,7 @@ function renderTitleSuffixIcon(h, params) {
   const titleSuffix = column.titleSuffix;
   if (titleSuffix) {
     return h('i', {
-      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
+      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : ''],
       on: {
         mouseenter(evnt) {
           $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
@@ -3698,7 +3703,9 @@ function renderTitleSuffixIcon(h, params) {
           $table.handleTargetLeaveEvent(evnt);
         }
       }
-    });
+    }, [h('i', {
+      class: titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -4915,9 +4922,11 @@ const Cell = {
     if (isEnableConf(editConfig)) {
       editIconVNs = [isRequired && editOpts.showAsterisk ? h('i', {
         class: 'vxe-cell--required-icon'
-      }) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? h('i', {
-        class: ['vxe-cell--edit-icon', editOpts.icon || cell_getIcon().TABLE_EDIT]
-      }) : renderEmptyElement($table)];
+      }, [h('i', {
+        class: 'vxe-cell--required-icon'
+      })]) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? h('i', {
+        class: 'vxe-cell--edit-icon'
+      }, [h('i')]) : renderEmptyElement($table)];
     }
     return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params)).concat(sortable ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []));
   },
@@ -29468,6 +29477,7 @@ const {
           const gCommandOpts = toolbar_commands.get(code);
           const params = {
             code,
+            button: null,
             tool: item,
             $table: $table,
             $grid: $xeGrid,
@@ -31723,7 +31733,7 @@ const blurEvent = 'blur';
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, eFns) {
+function getComponentOns(renderOpts, params, eFns, eventOns) {
   const {
     events
   } = renderOpts;
@@ -31767,7 +31777,7 @@ function getComponentOns(renderOpts, params, eFns) {
       }
     };
   }
-  return ons;
+  return eventOns ? Object.assign(ons, eventOns) : ons;
 }
 function getEditOns(renderOpts, params) {
   const {
@@ -32485,6 +32495,89 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleFilterMethod
   },
+  VxeDateRangePicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit(h, 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['update:startValue'] = value => {
+          if (startField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, startField, value);
+          }
+        };
+        seOs['update:endValue'] = value => {
+          if (endField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, endField, value);
+          }
+        };
+      }
+      return [h(getDefaultComponent(renderOpts), {
+        props: getCellEditProps(renderOpts, params, cellValue, seProps),
+        on: 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(h, 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(h, renderOpts, params, cellLabel);
+    }
+  },
   VxeTextarea: {
     tableAutoFocus: 'textarea',
     renderTableEdit: defaultEditRender
@@ -33126,6 +33219,9 @@ const Toolbar = VxeToolbar;
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',