vxe-table 3.19.17 → 3.19.19

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.17";
+const version = "3.19.19";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2545,10 +2545,10 @@ function getNodeOffset(elem, container, rest) {
   return rest;
 }
 function isPx(val) {
-  return val && /^\d+(px)?$/.test(val);
+  return val && /^\d+(\.\d+)?px?$/.test(val);
 }
 function isScale(val) {
-  return val && /^\d+%$/.test(val);
+  return val && /^\d+(\.\d+)?%$/.test(val);
 }
 function hasClass(elem, cls) {
   return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
@@ -2714,7 +2714,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.17"}`;
+const log_version = `table v${"3.19.19"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7728,24 +7728,6 @@ const {
 } = core_.VxeUI;
 const header_sourceType = 'table';
 const header_renderType = 'header';
-function getColumnFirstChild(column) {
-  const {
-    children
-  } = column;
-  if (children && children.length) {
-    return getColumnFirstChild(children[0]);
-  }
-  return column;
-}
-function getColumnLastChild(column) {
-  const {
-    children
-  } = column;
-  if (children && children.length) {
-    return getColumnLastChild(children[children.length - 1]);
-  }
-  return column;
-}
 function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -7916,15 +7898,13 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIn
     if (showCustomHeader) {
       // custom
     } else if (isColGroup && !isLastRow) {
-      const firstCol = getColumnFirstChild(column);
-      const lastCol = getColumnLastChild(column);
-      if (firstCol && lastCol && firstCol.id !== lastCol.id) {
-        const firstColRest = fullColumnIdData[firstCol.id];
-        const lastColRest = fullColumnIdData[lastCol.id];
-        if (firstColRest && lastColRest) {
-          tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+      let childWidth = 0;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childRow => {
+        if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+          childWidth += childRow.renderWidth;
         }
-      }
+      });
+      tcStyle.width = `${childWidth}px`;
     }
     return h('th', {
       class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
@@ -12067,7 +12047,7 @@ const {
               $xeTable.dispatchEvent(eventType, params, evnt);
             }
             return;
-          } else if (getEventTargetNode(evnt, $xeTable.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag) {
+          } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag || layout === 'body' && getEventTargetNode(evnt, el, 'vxe-table--empty-place-wrapper', target => target.getAttribute('xid') === xID).flag) {
             if (menuOpts.trigger === 'cell') {
               evnt.preventDefault();
             } else {
@@ -19495,7 +19475,10 @@ function renderBody(h, $xeTable) {
     h('div', {
       key: 'tn',
       ref: 'refEmptyPlaceholder',
-      class: 'vxe-table--empty-place-wrapper'
+      class: 'vxe-table--empty-place-wrapper',
+      attrs: {
+        xid: xID
+      }
     }, [h('div', {
       class: 'vxe-table--empty-placeholder'
     }, [h('div', {
@@ -24807,11 +24790,12 @@ const Toolbar = VxeToolbar;
           fixedRight: '冻结右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
@@ -24830,6 +24814,28 @@ const Toolbar = VxeToolbar;
           include: '包含',
           exclude: '不包含',
           between: '介于',
+          isAfter: '在以下日期之后',
+          eqAfter: '在以下日期之后或与之相同',
+          isBefore: '在以下日期之前',
+          eqBefore: '在以下日期之前或与之相同',
+          top10: '前10项',
+          aboveAverage: '高于平均值',
+          belowAverage: '低于平均值',
+          before: '之前',
+          after: '之后',
+          tomorrow: '明天',
+          today: '今天',
+          yesterday: '昨天',
+          nextWeek: '下周',
+          thisWeek: '本周',
+          lastWeek: '上周',
+          nextMonth: '下月',
+          thisMonth: '本月',
+          lastMonth: '上月',
+          nextYear: '明年',
+          thisYear: '今年',
+          lastYear: '去年',
+          yearToDate: '本年度截止到现在',
           custom: '自定义筛选',
           insensitive: '不区分大小写',
           isSensitive: '区分大小写'
@@ -24895,6 +24901,9 @@ const Toolbar = VxeToolbar;
         include: '包含',
         exclude: '不包含',
         between: '介于',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: '自定义筛选',
         insensitive: '不区分大小写',
         isSensitive: '区分大小写'
@@ -24912,11 +24921,12 @@ const Toolbar = VxeToolbar;
           fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'