vxe-table 4.5.18 → 4.5.19

package/lib/index.umd.js

@@ -2073,6 +2073,8 @@ const GlobalConfig = {
     SELECT_OPEN: iconPrefix + 'caret-down rotate180',
     SELECT_CLOSE: iconPrefix + 'caret-down',
     // pager
+    PAGER_HOME: iconPrefix + 'home-page',
+    PAGER_END: iconPrefix + 'end-page',
     PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
     PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
     PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
@@ -2281,7 +2283,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.5.18"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.5.19"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -4371,7 +4373,7 @@ const setup = config;
 const globalStore = {};
 const VXETable = {
   v,
-  version: "4.5.18",
+  version: "4.5.19",
   setup,
   globalStore,
   interceptor: interceptor,
@@ -4413,8 +4415,12 @@ const VXETable = {
     const $xetable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xetable', {});
     const {
       reactData: tableReactData,
-      internalData: tableInternalData
+      internalData: tableInternalData,
+      getComputeMaps
     } = $xetable;
+    const {
+      computeFilterOpts
+    } = getComputeMaps();
     const computeHasCheckOption = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         filterStore
@@ -4581,6 +4587,7 @@ const VXETable = {
         column,
         multiple
       } = filterStore;
+      const filterOpts = computeFilterOpts.value;
       const hasCheckOption = computeHasCheckOption.value;
       const filterRender = column.filterRender;
       const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null;
@@ -4593,9 +4600,9 @@ const VXETable = {
         },
         disabled: isDisabled,
         onClick: confirmFilter
-      }, conf.i18n('vxe.table.confirmFilter')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+      }, filterOpts.confirmButtonText || conf.i18n('vxe.table.confirmFilter')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         onClick: resetFilter
-      }, conf.i18n('vxe.table.resetFilter'))])] : [];
+      }, filterOpts.resetButtonText || conf.i18n('vxe.table.resetFilter'))])] : [];
     };
     const renderVN = () => {
       const {
@@ -15693,7 +15700,7 @@ dynamicApp.component(VxeIcon.name, VxeIcon);
 
 
 
-function renderHelpIcon(params) {
+function renderTitlePrefixIcon(params) {
   const {
     $table,
     column
@@ -15892,7 +15899,7 @@ const Cell = {
     return renderTitleContent(params, formatText(column.getTitle(), 1));
   },
   renderDefaultHeader(params) {
-    return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
+    return renderTitlePrefixIcon(params).concat(Cell.renderHeaderTitle(params));
   },
   renderDefaultCell(params) {
     const {
@@ -17186,12 +17193,13 @@ dynamicApp.component('VxeTableColgroup', src_group);
 
 
 const tableComponentPropKeys = Object.keys(props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', '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', 'openTooltip', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', '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', 'openTooltip', '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',
   props: {
     ...props,
+    layouts: Array,
     columns: Array,
     pagerConfig: Object,
     proxyConfig: Object,
@@ -17645,6 +17653,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         }
         restVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refFormWrapper,
+          key: 'form',
           class: 'vxe-grid--form-wrapper'
         }, slotVNs));
       }
@@ -17687,6 +17696,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         }
         restVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refToolbarWrapper,
+          key: 'toolbar',
           class: 'vxe-grid--toolbar-wrapper'
         }, slotVNs));
       }
@@ -17699,6 +17709,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       if (slots.top) {
         return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refTopWrapper,
+          key: 'top',
           class: 'vxe-grid--top-wrapper'
         }, slots.top({
           $grid: $xegrid
@@ -17706,6 +17717,42 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       }
       return [];
     };
+    const defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
+    const renderLayout = () => {
+      const {
+        layouts
+      } = props;
+      const vns = [];
+      const currLayouts = layouts && layouts.length ? layouts : conf.grid.layouts || defaultLayouts;
+      currLayouts.forEach(name => {
+        switch (name) {
+          case 'Form':
+            vns.push(renderForms());
+            break;
+          case 'Toolbar':
+            vns.push(renderToolbars());
+            break;
+          case 'Top':
+            vns.push(renderTops());
+            break;
+          case 'Table':
+            vns.push(renderTables());
+            break;
+          case 'Bottom':
+            vns.push(renderBottoms());
+            break;
+          case 'Pager':
+            vns.push(renderPagers());
+            break;
+          default:
+            if (true) {
+              errLog('vxe.error.notProp', [`layouts -> ${name}`]);
+            }
+            break;
+        }
+      });
+      return vns;
+    };
     const tableCompEvents = {};
     emits.forEach(name => {
       const type = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().camelCase(`on-${name}`);
@@ -17740,6 +17787,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       }
       return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-table'), {
         ref: refTable,
+        key: 'table',
         ...tableProps,
         ...tableOns
       }, slotObj)];
@@ -17751,6 +17799,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       if (slots.bottom) {
         return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refBottomWrapper,
+          key: 'bottom',
           class: 'vxe-grid--bottom-wrapper'
         }, slots.bottom({
           $grid: $xegrid
@@ -17799,6 +17848,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         }
         restVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refPagerWrapper,
+          key: 'pager',
           class: 'vxe-grid--pager-wrapper'
         }, slotVNs));
       }
@@ -18496,7 +18546,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           'is--loading': props.loading || reactData.tableLoading
         }],
         style: styles
-      }, renderForms().concat(renderToolbars(), renderTops(), renderTables(), renderBottoms(), renderPagers()));
+      }, renderLayout());
     };
     $xegrid.renderVN = renderVN;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xegrid', $xegrid);
@@ -19276,6 +19326,7 @@ dynamicApp.component(toolbar.name, toolbar);
 
 
 
+
 /* harmony default export */ var pager = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxePager',
   props: {
@@ -19350,7 +19401,9 @@ dynamicApp.component(toolbar.name, toolbar);
     iconJumpPrev: String,
     iconJumpNext: String,
     iconNextPage: String,
-    iconJumpMore: String
+    iconJumpMore: String,
+    iconHomePage: String,
+    iconEndPage: String
   },
   emits: ['update:pageSize', 'update:currentPage', 'page-change'],
   setup(props, context) {
@@ -19442,6 +19495,23 @@ dynamicApp.component(toolbar.name, toolbar);
         };
       });
     });
+    const handleHomePage = evnt => {
+      const {
+        currentPage
+      } = props;
+      if (currentPage > 1) {
+        changeCurrentPage(1, evnt);
+      }
+    };
+    const handleEndPage = evnt => {
+      const {
+        currentPage
+      } = props;
+      const pageCount = computePageCount.value;
+      if (currentPage < pageCount) {
+        changeCurrentPage(pageCount, evnt);
+      }
+    };
     const handlePrevPage = evnt => {
       const {
         currentPage
@@ -19502,6 +19572,19 @@ dynamicApp.component(toolbar.name, toolbar);
         handlePrevPage(evnt);
       }
     };
+    // 第一页
+    const renderHomePage = () => {
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+        class: ['vxe-pager--prev-btn', {
+          'is--disabled': props.currentPage <= 1
+        }],
+        type: 'button',
+        title: conf.i18n('vxe.pager.homePageTitle'),
+        onClick: handleHomePage
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+        class: ['vxe-pager--btn-icon', props.iconHomePage || conf.icon.PAGER_HOME]
+      })]);
+    };
     // 上一页
     const renderPrevPage = () => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
@@ -19509,7 +19592,7 @@ dynamicApp.component(toolbar.name, toolbar);
           'is--disabled': props.currentPage <= 1
         }],
         type: 'button',
-        title: conf.i18n('vxe.pager.prevPage'),
+        title: conf.i18n('vxe.pager.prevPageTitle'),
         onClick: handlePrevPage
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-pager--btn-icon', props.iconPrevPage || conf.icon.PAGER_PREV_PAGE]
@@ -19523,7 +19606,7 @@ dynamicApp.component(toolbar.name, toolbar);
           'is--disabled': props.currentPage <= 1
         }],
         type: 'button',
-        title: conf.i18n('vxe.pager.prevJump'),
+        title: conf.i18n('vxe.pager.prevJumpTitle'),
         onClick: handlePrevJump
       }, [tagName ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-pager--jump-more-icon', props.iconJumpMore || conf.icon.PAGER_JUMP_MORE]
@@ -19540,7 +19623,7 @@ dynamicApp.component(toolbar.name, toolbar);
           'is--disabled': props.currentPage >= pageCount
         }],
         type: 'button',
-        title: conf.i18n('vxe.pager.nextJump'),
+        title: conf.i18n('vxe.pager.nextJumpTitle'),
         onClick: handleNextJump
       }, [tagName ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-pager--jump-more-icon', props.iconJumpMore || conf.icon.PAGER_JUMP_MORE]
@@ -19556,12 +19639,26 @@ dynamicApp.component(toolbar.name, toolbar);
           'is--disabled': props.currentPage >= pageCount
         }],
         type: 'button',
-        title: conf.i18n('vxe.pager.nextPage'),
+        title: conf.i18n('vxe.pager.nextPageTitle'),
         onClick: handleNextPage
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-pager--btn-icon', props.iconNextPage || conf.icon.PAGER_NEXT_PAGE]
       })]);
     };
+    // 最后一页
+    const renderEndPage = () => {
+      const pageCount = computePageCount.value;
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+        class: ['vxe-pager--prev-btn', {
+          'is--disabled': props.currentPage >= pageCount
+        }],
+        type: 'button',
+        title: conf.i18n('vxe.pager.endPageTitle'),
+        onClick: handleEndPage
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+        class: ['vxe-pager--btn-icon', props.iconEndPage || conf.icon.PAGER_END]
+      })]);
+    };
     // 页数
     const renderNumber = showJump => {
       const {
@@ -19674,6 +19771,14 @@ dynamicApp.component(toolbar.name, toolbar);
           $event: evnt
         }, params));
       },
+      homePage() {
+        handleHomePage();
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
+      endPage() {
+        handleEndPage();
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
       prevPage() {
         handlePrevPage();
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -19720,23 +19825,29 @@ dynamicApp.component(toolbar.name, toolbar);
       layouts.forEach(name => {
         let renderFn;
         switch (name) {
-          case 'PrevPage':
-            renderFn = renderPrevPage;
+          case 'Home':
+            renderFn = renderHomePage;
             break;
           case 'PrevJump':
             renderFn = renderPrevJump;
             break;
+          case 'PrevPage':
+            renderFn = renderPrevPage;
+            break;
           case 'Number':
             renderFn = renderNumber;
             break;
           case 'JumpNumber':
             renderFn = renderJumpNumber;
             break;
+          case 'NextPage':
+            renderFn = renderNextPage;
+            break;
           case 'NextJump':
             renderFn = renderNextJump;
             break;
-          case 'NextPage':
-            renderFn = renderNextPage;
+          case 'End':
+            renderFn = renderEndPage;
             break;
           case 'Sizes':
             renderFn = renderSizes;
@@ -19756,6 +19867,10 @@ dynamicApp.component(toolbar.name, toolbar);
         }
         if (renderFn) {
           childNodes.push(renderFn());
+        } else {
+          if (true) {
+            errLog('vxe.error.notProp', [`layouts -> ${name}`]);
+          }
         }
       });
       if (slots.right) {
@@ -28266,12 +28381,12 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       });
       if (scrollXLoad) {
         if (true) {
-          if (props.showHeader && !props.showHeaderOverflow) {
-            warnLog('vxe.error.reqProp', ['show-header-overflow']);
-          }
-          if (props.showFooter && !props.showFooterOverflow) {
-            warnLog('vxe.error.reqProp', ['show-footer-overflow']);
-          }
+          // if (props.showHeader && !props.showHeaderOverflow) {
+          //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+          // }
+          // if (props.showFooter && !props.showFooterOverflow) {
+          //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+          // }
           if (props.spanMethod) {
             warnLog('vxe.error.scrollErrProp', ['span-method']);
           }
@@ -29130,10 +29245,11 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         } = reactData;
         const {
           tableFullData,
-          afterFullData
+          afterFullData,
+          tableFullTreeData
         } = internalData;
         return {
-          fullData: tableFullData.slice(0),
+          fullData: props.treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0),
           visibleData: afterFullData.slice(0),
           tableData: tableData.slice(0),
           footerData: footerTableData.slice(0)
@@ -29146,13 +29262,17 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
         const targetColumn = getRootColumn($xetable, column);
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        const columnOpts = computeColumnOpts.value;
+        const {
+          maxFixedSize
+        } = columnOpts;
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (VXETable.modal) {
               VXETable.modal.message({
                 status: 'error',
-                content: conf.i18n('vxe.table.maxFixedCol')
+                content: conf.i18n('vxe.table.maxFixedCol', [maxFixedSize])
               });
             }
             return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -33529,10 +33649,18 @@ dynamicApp.component(table.name, table);
       pagesize: '{0}条/页',
       total: '共 {0} 条记录',
       pageClassifier: '页',
+      homePage: '首页',
+      homePageTitle: '首页',
       prevPage: '上一页',
+      prevPageTitle: '上一页',
       nextPage: '下一页',
+      nextPageTitle: '下一页',
       prevJump: '向上跳页',
-      nextJump: '向下跳页'
+      prevJumpTitle: '向上跳页',
+      nextJump: '向下跳页',
+      nextJumpTitle: '向下跳页',
+      endPage: '末页',
+      endPageTitle: '末页'
     },
     alert: {
       title: '消息提示'